[runtime] Clean up symbols in error machinery. (swiftlang#12853)

* [runtime] Clean up symbols in error machinery.

* [runtime] Clean up symbols in Foundation overlay.

* [runtime] Clean up symbols in collections and hashing.

* [runtime] Remove symbol controls from the Linux definition of swift_allocError.

* [tests] Add more stub functions for tests that link directly to the runtime.

Author: Greg Parker

include/swift/AST/KnownDecls.def

@@ -49,8 +49,6 @@ FUNC_DECL(ForceBridgeFromObjectiveC,
           "_forceBridgeFromObjectiveC")
 FUNC_DECL(ConditionallyBridgeFromObjectiveC,
           "_conditionallyBridgeFromObjectiveC")
-FUNC_DECL(BridgeErrorToNSError,
-          "_bridgeErrorToNSError")
 
 FUNC_DECL(ForceBridgeFromObjectiveCBridgeable,
           "_forceBridgeFromObjectiveC_bridgeable")
@@ -66,7 +64,7 @@ FUNC_DECL(ConvertToAnyHashable, "_convertToAnyHashable")
 
 FUNC_DECL(DiagnoseUnexpectedNilOptional, "_diagnoseUnexpectedNilOptional")
 
-FUNC_DECL(GetErrorEmbeddedNSError, "_stdlib_getErrorEmbeddedNSError")
+FUNC_DECL(GetErrorEmbeddedNSError, "_getErrorEmbeddedNSError")
 
 FUNC_DECL(UnsafeBitCast, "unsafeBitCast")
 

include/swift/Runtime/Debug.h

@@ -210,16 +210,12 @@ enum: uintptr_t {
 };
 
 /// Debugger hook. Calling this stops the debugger with a message and details
-/// about the issues.
-///
-/// This is not considered a finalized runtime entry point at this time. Do not
-/// emit calls to it from arbitrary Swift code; it's only meant for libraries
-/// that ship with the runtime (i.e. the stdlib and overlays).
-SWIFT_RUNTIME_EXPORT
+/// about the issues. Called by overlays.
+SWIFT_RUNTIME_STDLIB_SPI
 void _swift_reportToDebugger(uintptr_t flags, const char *message,
                              RuntimeErrorDetails *details = nullptr);
 
-SWIFT_RUNTIME_EXPORT
+SWIFT_RUNTIME_STDLIB_SPI
 bool _swift_reportFatalErrorsToDebugger;
 
 // namespace swift

lib/IRGen/Linking.cpp

@@ -166,9 +166,9 @@ std::string LinkEntity::mangleAsString() const {
       //   entity ::= declaration                     // other declaration
     case Kind::Function:
       // As a special case, functions can have manually mangled names.
-      if (auto AsmA = getDecl()->getAttrs().getAttribute<SILGenNameAttr>()) {
-        return AsmA->Name;
-      }
+      if (auto AsmA = getDecl()->getAttrs().getAttribute<SILGenNameAttr>())
+        if (!AsmA->Name.empty())
+          return AsmA->Name;
 
       // Otherwise, fall through into the 'other decl' case.
       LLVM_FALLTHROUGH;

lib/SIL/SILDeclRef.cpp

@@ -701,7 +701,8 @@ std::string SILDeclRef::mangle(ManglingKind MKind) const {
     // Use the SILGen name only for the original non-thunked, non-curried entry
     // point.
     if (auto NameA = getDecl()->getAttrs().getAttribute<SILGenNameAttr>())
-      if (!isForeignToNativeThunk() && !isNativeToForeignThunk()
+      if (!NameA->Name.empty() &&
+          !isForeignToNativeThunk() && !isNativeToForeignThunk()
           && !isCurried) {
         return NameA->Name;
       }

lib/SILGen/SILGenGlobalVariable.cpp

@@ -26,11 +26,14 @@ SILGlobalVariable *SILGenModule::getSILGlobalVariable(VarDecl *gDecl,
   // First, get a mangled name for the declaration.
   std::string mangledName;
 
-  if (auto SILGenName = gDecl->getAttrs().getAttribute<SILGenNameAttr>()) {
-    mangledName = SILGenName->Name;
-  } else {
-    Mangle::ASTMangler NewMangler;
-    mangledName = NewMangler.mangleGlobalVariableFull(gDecl);
+  {
+    auto SILGenName = gDecl->getAttrs().getAttribute<SILGenNameAttr>();
+    if (SILGenName && !SILGenName->Name.empty()) {
+      mangledName = SILGenName->Name;
+    } else {
+      Mangle::ASTMangler NewMangler;
+      mangledName = NewMangler.mangleGlobalVariableFull(gDecl);
+    }
   }
 
   // Check if it is already created, and update linkage if necessary.

stdlib/public/SDK/Foundation/DataThunks.m

@@ -111,7 +111,7 @@ static NSInteger _NSWriteToFileDescriptor(int32_t fd, const void *buffer, NSUInt
     return error;
 }
 
-SWIFT_CC(swift)
+SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERNAL
 BOOL __NSDataWriteToURL(NSData *NS_RELEASES_ARGUMENT data, NSURL *NS_RELEASES_ARGUMENT url, NSDataWritingOptions writingOptions, NSError **_Nullable errorPtr) {
     assert((writingOptions & NSDataWritingAtomic) == 0);
 

stdlib/public/SDK/Foundation/NSError.swift

@@ -27,7 +27,6 @@ public typealias ErrorPointer = NSErrorPointer
 public // COMPILER_INTRINSIC
 let _nilObjCError: Error = _GenericObjCError.nilError
 
-@_silgen_name("swift_convertNSErrorToError")
 public // COMPILER_INTRINSIC
 func _convertNSErrorToError(_ error: NSError?) -> Error {
   if let error = error {
@@ -36,7 +35,6 @@ func _convertNSErrorToError(_ error: NSError?) -> Error {
   return _nilObjCError
 }
 
-@_silgen_name("swift_convertErrorToNSError")
 public // COMPILER_INTRINSIC
 func _convertErrorToNSError(_ error: Error) -> NSError {
   return unsafeDowncast(_bridgeErrorToNSError(error), to: NSError.self)
@@ -147,7 +145,7 @@ public extension CustomNSError {
 
   /// The error code within the given domain.
   var errorCode: Int {
-    return _swift_getDefaultErrorCode(self)
+    return _getDefaultErrorCode(self)
   }
 
   /// The default user-info dictionary.
@@ -201,8 +199,7 @@ internal let _errorDomainUserInfoProviderQueue = DispatchQueue(
   label: "SwiftFoundation._errorDomainUserInfoProviderQueue")
 
 /// Retrieve the default userInfo dictionary for a given error.
-@_silgen_name("swift_Foundation_getErrorDefaultUserInfo")
-public func _swift_Foundation_getErrorDefaultUserInfo<T: Error>(_ error: T)
+public func _getErrorDefaultUserInfo<T: Error>(_ error: T)
   -> AnyObject? {
   let hasUserInfoValueProvider: Bool
 
@@ -358,8 +355,7 @@ public protocol _ObjectiveCBridgeableError : Error {
 /// If the bridge succeeds, the bridged value is written to the uninitialized
 /// memory pointed to by 'out', and true is returned. Otherwise, 'out' is
 /// left uninitialized, and false is returned.
-@_silgen_name("swift_stdlib_bridgeNSErrorToError")
-public func _stdlib_bridgeNSErrorToError<
+public func _bridgeNSErrorToError<
   T : _ObjectiveCBridgeableError
 >(_ error: NSError, out: UnsafeMutablePointer<T>) -> Bool {
   if let bridged = T(_bridgedNSError: error) {

stdlib/public/SDK/Foundation/NSString.swift

@@ -22,9 +22,8 @@ public class NSSimpleCString {}
 @available(*, unavailable, message: "Please use String or NSString")
 public class NSConstantString {}
 
-@_silgen_name("swift_convertStringToNSString")
-public // COMPILER_INTRINSIC
-func _convertStringToNSString(_ string: String) -> NSString {
+// Called by the SwiftObject implementation.
+public func _convertStringToNSString(_ string: String) -> NSString {
   return string._bridgeToObjectiveC()
 }
 

stdlib/public/SDK/Foundation/NSUndoManager.swift

@@ -13,12 +13,6 @@
 @_exported import Foundation // Clang module
 import _SwiftFoundationOverlayShims
 
-@_silgen_name("NS_Swift_NSUndoManager_registerUndoWithTargetHandler")
-internal func NS_Swift_NSUndoManager_registerUndoWithTargetHandler(
-  _ self_: AnyObject,
-  _ target: AnyObject,
-  _ handler: @escaping @convention(block) (AnyObject) -> Void)
-
 extension UndoManager {
   @available(*, unavailable, renamed: "registerUndo(withTarget:handler:)")
   public func registerUndoWithTarget<TargetType : AnyObject>(_ target: TargetType, handler: (TargetType) -> Void) {

stdlib/public/SwiftShims/Visibility.h

@@ -109,12 +109,33 @@
 #define SWIFT_RUNTIME_EXPORT SWIFT_EXPORT_ATTRIBUTE
 #endif
 
-/// Attribute for runtime-stdlib SPI interfaces.
+
+/// Attributes for runtime-stdlib interfaces.
+/// Use these for C implementations that are imported into Swift via SwiftShims
+/// and for C implementations of Swift @_silgen_name declarations
+/// Note that @_silgen_name implementations must also be marked SWIFT_CC(swift).
+///
+/// SWIFT_RUNTIME_STDLIB_API functions are called by compiler-generated code
+/// or by @_inlineable Swift code.
+/// Such functions must be exported and must be supported forever as API.
+/// The function name should be prefixed with `swift_`.
+///
+/// SWIFT_RUNTIME_STDLIB_SPI functions are called by overlay code.
+/// Such functions must be exported, but are still SPI
+/// and may be changed at any time.
+/// The function name should be prefixed with `_swift_`.
 ///
-/// Since the stdlib is currently fully fragile, runtime-stdlib SPI currently
-/// needs to be exported from the core dylib. When the stdlib admits more
-/// resilience we may be able to make this hidden.
-#define SWIFT_RUNTIME_STDLIB_INTERFACE SWIFT_RUNTIME_EXPORT
+/// SWIFT_RUNTIME_STDLIB_INTERNAL functions are called only by the stdlib.
+/// Such functions are internal and are not exported.
+/// FIXME(sil-serialize-all): _INTERNAL functions are also exported for now
+/// until the tide of @_inlineable is rolled back.
+/// They really should be LLVM_LIBRARY_VISIBILITY, not SWIFT_RUNTIME_EXPORT.
+#define SWIFT_RUNTIME_STDLIB_API       SWIFT_RUNTIME_EXPORT
+#define SWIFT_RUNTIME_STDLIB_SPI       SWIFT_RUNTIME_EXPORT
+#define SWIFT_RUNTIME_STDLIB_INTERNAL  SWIFT_RUNTIME_EXPORT
+
+/// Old marker for runtime-stdlib interfaces. This marker will go away soon.
+#define SWIFT_RUNTIME_STDLIB_INTERFACE SWIFT_RUNTIME_STDLIB_API
 
 // SWIFT_STDLIB_SHIMS_VISIBILITY_H
 #endif