Skip to content

Commit 89cf1dc

Browse files
kateinoigakukunkateinoigakukun
authored
Merge pull request #5141 from swiftwasm/katei/merge-release-5.8-2023-01-05
Merge release/5.8 2023-01-05
2 parents 8dce198 + ea6d451 commit 89cf1dc

24 files changed

+330
-65
lines changed

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6727,6 +6727,12 @@ WARNING(has_symbol_decl_must_be_weak,none,
67276727
(DescriptiveDeclKind, DeclName))
67286728
ERROR(has_symbol_invalid_expr,none,
67296729
"'#_hasSymbol' condition must refer to a declaration", ())
6730+
ERROR(has_symbol_invalid_decl_use_responds_to_selector,none,
6731+
"'#_hasSymbol' cannot be used with Objective-C %select{method|property}0 "
6732+
"'%1'; use respondsToSelector() instead",
6733+
(unsigned, StringRef))
6734+
ERROR(has_symbol_invalid_decl,none,
6735+
"'#_hasSymbol' cannot be used with this declaration", ())
67306736

67316737
//------------------------------------------------------------------------------
67326738
// MARK: Type erasure

‎include/swift/SIL/SILSymbolVisitor.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,14 @@ class SILSymbolVisitor {
128128

129129
template <typename F>
130130
void enumerateFunctionsForHasSymbol(SILModule &M, ValueDecl *D, F Handler) {
131+
// Handle clang decls separately.
132+
if (auto *clangDecl = D->getClangDecl()) {
133+
if (isa<clang::FunctionDecl>(clangDecl))
134+
Handler(SILDeclRef(D).asForeign());
135+
136+
return;
137+
}
138+
131139
class SymbolVisitor : public SILSymbolVisitor {
132140
F Handler;
133141

‎lib/AST/ASTPrinter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7124,7 +7124,6 @@ swift::getInheritedForPrinting(
71247124
}
71257125

71267126
// Collect synthesized conformances.
7127-
auto &ctx = decl->getASTContext();
71287127
llvm::SetVector<ProtocolDecl *> protocols;
71297128
llvm::TinyPtrVector<ProtocolDecl *> uncheckedProtocols;
71307129
for (auto attr : decl->getAttrs().getAttributes<SynthesizedProtocolAttr>()) {

‎lib/IRGen/GenHasSymbol.cpp

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include "swift/SIL/SILFunctionBuilder.h"
2222
#include "swift/SIL/SILModule.h"
2323
#include "swift/SIL/SILSymbolVisitor.h"
24+
#include "clang/AST/DeclObjC.h"
25+
#include "clang/AST/GlobalDecl.h"
2426

2527
#include "GenDecl.h"
2628
#include "IRGenFunction.h"
@@ -68,9 +70,8 @@ class HasSymbolIRGenVisitor : public IRSymbolVisitor {
6870
SILFunction *silFn = IGM.getSILModule().lookUpFunction(name);
6971
// Definitions for each SIL function should have been emitted by SILGen.
7072
assert(silFn && "missing SIL function?");
71-
if (silFn) {
73+
if (silFn)
7274
addFunction(silFn);
73-
}
7475
}
7576

7677
public:
@@ -111,6 +112,39 @@ class HasSymbolIRGenVisitor : public IRSymbolVisitor {
111112
}
112113
};
113114

115+
static llvm::Constant *
116+
getAddrOfLLVMVariableForClangDecl(IRGenModule &IGM, ValueDecl *decl,
117+
const clang::Decl *clangDecl) {
118+
if (isa<clang::FunctionDecl>(clangDecl)) {
119+
SILFunction *silFn =
120+
IGM.getSILModule().lookUpFunction(SILDeclRef(decl).asForeign());
121+
assert(silFn && "missing SIL function?");
122+
return silFn ? IGM.getAddrOfSILFunction(silFn, NotForDefinition) : nullptr;
123+
}
124+
125+
if (auto var = dyn_cast<clang::ObjCInterfaceDecl>(clangDecl))
126+
return IGM.getAddrOfObjCClass(cast<ClassDecl>(decl), NotForDefinition);
127+
128+
llvm::report_fatal_error("Unexpected clang decl kind");
129+
}
130+
131+
static void
132+
getSymbolAddrsForDecl(IRGenModule &IGM, ValueDecl *decl,
133+
llvm::SmallVector<llvm::Constant *, 4> &addrs) {
134+
if (auto *clangDecl = decl->getClangDecl()) {
135+
if (auto *addr = getAddrOfLLVMVariableForClangDecl(IGM, decl, clangDecl))
136+
addrs.push_back(addr);
137+
return;
138+
}
139+
140+
SILSymbolVisitorOptions opts;
141+
opts.VisitMembers = false;
142+
auto silCtx = SILSymbolVisitorContext(IGM.getSwiftModule(), opts);
143+
auto linkInfo = UniversalLinkageInfo(IGM);
144+
auto symbolVisitorCtx = IRSymbolVisitorContext(linkInfo, silCtx);
145+
HasSymbolIRGenVisitor(IGM, addrs).visit(decl, symbolVisitorCtx);
146+
}
147+
114148
llvm::Function *IRGenModule::emitHasSymbolFunction(ValueDecl *decl) {
115149

116150
PrettyStackTraceDecl trace("emitting #_hasSymbol query for", decl);
@@ -119,14 +153,9 @@ llvm::Function *IRGenModule::emitHasSymbolFunction(ValueDecl *decl) {
119153
auto func = cast<llvm::Function>(getOrCreateHelperFunction(
120154
mangler.mangleHasSymbolQuery(decl), Int1Ty, {},
121155
[decl, this](IRGenFunction &IGF) {
122-
SILSymbolVisitorOptions opts;
123-
opts.VisitMembers = false;
124-
auto silCtx = SILSymbolVisitorContext(getSwiftModule(), opts);
125-
auto linkInfo = UniversalLinkageInfo(*this);
126-
auto symbolVisitorCtx = IRSymbolVisitorContext(linkInfo, silCtx);
127156
auto &Builder = IGF.Builder;
128157
llvm::SmallVector<llvm::Constant *, 4> addrs;
129-
HasSymbolIRGenVisitor(*this, addrs).visit(decl, symbolVisitorCtx);
158+
getSymbolAddrsForDecl(*this, decl, addrs);
130159

131160
llvm::Value *ret = nullptr;
132161
for (llvm::Constant *addr : addrs) {

‎lib/SILOptimizer/Transforms/COWOpts.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,10 @@ void COWOptsPass::collectEscapePoints(SILValue v,
267267
escapePoints, handled);
268268
break;
269269
case SILInstructionKind::CondBranchInst:
270-
collectEscapePoints(cast<CondBranchInst>(user)->getArgForOperand(use),
271-
escapePoints, handled);
270+
if (use->getOperandNumber() != CondBranchInst::ConditionIdx) {
271+
collectEscapePoints(cast<CondBranchInst>(user)->getArgForOperand(use),
272+
escapePoints, handled);
273+
}
272274
break;
273275
case SILInstructionKind::StructInst:
274276
case SILInstructionKind::StructExtractInst:

‎lib/Sema/MiscDiagnostics.cpp

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "swift/Parse/Parser.h"
3939
#include "swift/Sema/ConstraintSystem.h"
4040
#include "swift/Sema/IDETypeChecking.h"
41+
#include "clang/AST/DeclObjC.h"
4142
#include "llvm/ADT/MapVector.h"
4243
#include "llvm/ADT/StringSwitch.h"
4344
#include "llvm/Support/SaveAndRestore.h"
@@ -4470,6 +4471,35 @@ static bool diagnoseAvailabilityCondition(PoundAvailableInfo *info,
44704471
return false;
44714472
}
44724473

4474+
/// Diagnoses whether the given clang::Decl can be referenced by a
4475+
/// `if #_hasSymbol(...)` condition. Returns true if a diagnostic was emitted.
4476+
static bool diagnoseHasSymbolConditionClangDecl(SourceLoc loc,
4477+
const clang::Decl *clangDecl,
4478+
ASTContext &ctx) {
4479+
if (isa<clang::ObjCInterfaceDecl>(clangDecl) ||
4480+
isa<clang::FunctionDecl>(clangDecl))
4481+
return false;
4482+
4483+
if (auto *method = dyn_cast<clang::ObjCMethodDecl>(clangDecl)) {
4484+
// FIXME: Allow objc_direct methods when supported by IRGen.
4485+
ctx.Diags.diagnose(loc,
4486+
diag::has_symbol_invalid_decl_use_responds_to_selector,
4487+
/*isProperty*/ false, method->getNameAsString());
4488+
return true;
4489+
}
4490+
4491+
if (auto *property = dyn_cast<clang::ObjCPropertyDecl>(clangDecl)) {
4492+
// FIXME: Allow objc_direct properties when supported by IRGen.
4493+
ctx.Diags.diagnose(loc,
4494+
diag::has_symbol_invalid_decl_use_responds_to_selector,
4495+
/*isProperty*/ true, property->getNameAsString());
4496+
return true;
4497+
}
4498+
4499+
ctx.Diags.diagnose(loc, diag::has_symbol_invalid_decl);
4500+
return true;
4501+
}
4502+
44734503
/// Diagnoses a `if #_hasSymbol(...)` condition. Returns true if a diagnostic
44744504
/// was emitted.
44754505
static bool diagnoseHasSymbolCondition(PoundHasSymbolInfo *info,
@@ -4495,6 +4525,12 @@ static bool diagnoseHasSymbolCondition(PoundHasSymbolInfo *info,
44954525
return true;
44964526
}
44974527

4528+
if (auto *clangDecl = decl->getClangDecl()) {
4529+
if (diagnoseHasSymbolConditionClangDecl(symbolExpr->getLoc(), clangDecl,
4530+
ctx))
4531+
return true;
4532+
}
4533+
44984534
if (DC->getFragileFunctionKind().kind == FragileFunctionKind::None &&
44994535
!decl->isWeakImported(DC->getParentModule())) {
45004536
// `if #_hasSymbol(someStronglyLinkedSymbol)` is functionally a no-op

‎stdlib/public/core/StaticBigInt.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,6 @@ public struct StaticBigInt:
4343
public init(_builtinIntegerLiteral value: Builtin.IntLiteral) {
4444
_value = value
4545
}
46-
47-
/// Returns the given value unchanged.
48-
@_alwaysEmitIntoClient
49-
@available(SwiftStdlib 5.8, *)
50-
@inline(__always)
51-
public static prefix func + (_ rhs: Self) -> Self {
52-
rhs
53-
}
5446
}
5547

5648
//===----------------------------------------------------------------------===//
@@ -117,7 +109,7 @@ extension StaticBigInt {
117109
/// negative[1] //-> 0xFFEEDDCCBBAA9988
118110
/// negative[2] //-> 0xFFFFFFFFFFFFFFFF
119111
///
120-
/// let positive: StaticBigInt = +0x0011223344556677_8899AABBCCDDEEFF
112+
/// let positive: StaticBigInt = 0x0011223344556677_8899AABBCCDDEEFF
121113
/// positive.signum() //-> +1
122114
/// positive.bitWidth //-> 118
123115
/// positive[0] //-> 0x8899AABBCCDDEEFF

‎test/IRGen/Inputs/has_symbol_helper.swift renamed to ‎test/IRGen/Inputs/has_symbol/has_symbol_helper.swift

File renamed without changes.

‎test/IRGen/Inputs/has_symbol/has_symbol_helper_clang.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// NOTE: This header is used on platforms that do not support Obj-C.
2+
3+
extern void clangFunc(int x);

‎test/IRGen/Inputs/has_symbol/has_symbol_helper_objc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@import Foundation;
2+
3+
@interface ObjCClass : NSObject
4+
@end

0 commit comments

Comments
 (0)