Merge pull request swiftlang#78245 from tshortli/revert-silgen-name-p…

…ublic-linkage-6.1 [6.1] SIL: Revert public linkage for `@_silgen_name` forward declarations
swiftwasm · Dec 17, 2024 · 89619f4 · 89619f4
2 parents 2285785 + c4c3797
commit 89619f4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 58 deletions.
diff --git a/lib/SIL/IR/SILDeclRef.cpp b/lib/SIL/IR/SILDeclRef.cpp
@@ -651,14 +651,6 @@ SILLinkage SILDeclRef::getDefinitionLinkage() const {
       effectiveAccess = std::max(effectiveAccess, AccessLevel::Internal);
   }
 
-  // Declarations with a @_silgen_name attribute and no body may be forward
-  // declarations of functions defined in another module. Therefore they must
-  // always have external (public) linkage, regardless of declared access level.
-  if (auto afd = getAbstractFunctionDecl()) {
-    if (!afd->hasBody() && afd->getAttrs().hasAttribute<SILGenNameAttr>())
-      effectiveAccess = AccessLevel::Public;
-  }
-
   switch (effectiveAccess) {
   case AccessLevel::Private:
   case AccessLevel::FilePrivate:

diff --git a/test/IRGen/silgen_name_linkage.swift b/test/IRGen/silgen_name_linkage.swift
diff --git a/test/stdlib/Error.swift b/test/stdlib/Error.swift
@@ -229,7 +229,7 @@ func throwJazzHandsTyped() throws(SillyError) {
 // not available, so pass it through an UnsafeRawPointer.
 @available(SwiftStdlib 5.8, *)
 @_silgen_name("_swift_setWillThrowHandler")
-func setWillThrowHandler(
+public func setWillThrowHandler(
     _ handler: (@convention(c) (UnsafeRawPointer) -> Void)?
 )