[NSError bridging] Rename runtime entry points for _getErrorEmbeddedNSError.

This clarifies the 'Indirect' case. Thanks, Dmitri!

Author: DougGregor

include/swift/AST/KnownDecls.def

@@ -71,6 +71,6 @@ FUNC_DECL(BridgeAnythingToObjectiveC,
 FUNC_DECL(DidEnterMain, "_stdlib_didEnterMain")
 FUNC_DECL(DiagnoseUnexpectedNilOptional, "_diagnoseUnexpectedNilOptional")
 
-FUNC_DECL(GetErrorEmbeddedNSErrorValue, "_stdlib_getErrorEmbeddedNSErrorValue")
+FUNC_DECL(GetErrorEmbeddedNSError, "_stdlib_getErrorEmbeddedNSError")
 
 #undef FUNC_DECL

lib/SILGen/SILGenConvert.cpp

@@ -539,7 +539,7 @@ ManagedValue SILGenFunction::emitExistentialErasure(
         ManagedValue concreteValue = F(SGFContext());
         ManagedValue potentialNSError =
           emitApplyOfLibraryIntrinsic(loc,
-                                      SGM.getGetErrorEmbeddedNSErrorValue(loc),
+                                      SGM.getGetErrorEmbeddedNSError(loc),
                                       ctx.AllocateCopy(substitutions),
                                       { concreteValue },
                                       SGFContext())

stdlib/public/core/ErrorType.swift

@@ -149,15 +149,15 @@ public func _stdlib_getErrorUserInfoNSDictionary<T : Error>(_ x: UnsafePointer<T
   return x.pointee._userInfo.map { $0 as AnyObject }
 }
 
-@_silgen_name("swift_stdlib_getErrorEmbeddedNSError")
-public func _stdlib_getErrorEmbeddedNSError<T : Error>(_ x: UnsafePointer<T>)
--> AnyObject? {
+@_silgen_name("swift_stdlib_getErrorEmbeddedNSErrorIndirect")
+public func _stdlib_getErrorEmbeddedNSErrorIndirect<T : Error>(
+    _ x: UnsafePointer<T>) -> AnyObject? {
   return x.pointee._getEmbeddedNSError()
 }
 
 /// FIXME: Quite unfortunate to have both of these.
-@_silgen_name("swift_stdlib_getErrorEmbeddedNSErrorValue")
-public func _stdlib_getErrorEmbeddedNSErrorValue<T : Error>(_ x: T)
+@_silgen_name("swift_stdlib_getErrorEmbeddedNSError")
+public func _stdlib_getErrorEmbeddedNSError<T : Error>(_ x: T)
 -> AnyObject? {
   return x._getEmbeddedNSError()
 }

stdlib/public/runtime/Casting.cpp

@@ -2006,21 +2006,23 @@ static bool _dynamicCastToFunction(OpaqueValue *dest,
 }
 
 #if SWIFT_OBJC_INTEROP
-// @_silgen_name("swift_stdlib_getErrorEmbeddedNSError")
-// public func _stdlib_getErrorEmbeddedNSError<T : Error>(_ x: UnsafePointer<T>)
-//   -> AnyObject?
+// @_silgen_name("swift_stdlib_getErrorEmbeddedNSErrorIndirect")
+// public func _stdlib_getErrorEmbeddedNSErrorIndirect<T : Error>(
+///    _ x: UnsafePointer<T>) -> AnyObject?
 SWIFT_CC(swift)
-extern "C" id swift_stdlib_getErrorEmbeddedNSError(const OpaqueValue *error,
-                                                   const Metadata *T,
-                                                   const WitnessTable *Error);
+extern "C" id swift_stdlib_getErrorEmbeddedNSErrorIndirect(
+                const OpaqueValue *error,
+                const Metadata *T,
+                const WitnessTable *Error);
 
 static id dynamicCastValueToNSError(OpaqueValue *src,
                                     const Metadata *srcType,
                                     const WitnessTable *srcErrorWitness,
                                     DynamicCastFlags flags) {
   // Check whether there is an embedded error.
-  if (auto embedded = swift_stdlib_getErrorEmbeddedNSError(src, srcType,
-                                                           srcErrorWitness)) {
+  if (auto embedded =
+          swift_stdlib_getErrorEmbeddedNSErrorIndirect(src, srcType,
+                                                       srcErrorWitness)) {
     if (flags & DynamicCastFlags::TakeOnSuccess)
       srcType->vw_destroy(src);
 

test/SILGen/objc_error.swift

@@ -124,7 +124,7 @@ extension Error {
   // CHECK-LABEL: sil hidden @_TFE10objc_errorPs5Error16convertToNSErrorfT_CSo7NSError
   // CHECK: bb0([[SELF:%[0-9]+]] : $*Self)
 	func convertToNSError() -> NSError {
-    // CHECK: [[GET_EMBEDDED_FN:%[0-9]+]] = function_ref @swift_stdlib_getErrorEmbeddedNSErrorValue 
+    // CHECK: [[GET_EMBEDDED_FN:%[0-9]+]] = function_ref @swift_stdlib_getErrorEmbeddedNSError
     // CHECK: [[EMBEDDED_RESULT_OPT:%[0-9]+]] = apply [[GET_EMBEDDED_FN]]
     // CHECK: [[HAS_EMBEDDED_RESULT:%[0-9]+]] = select_enum [[EMBEDDED_RESULT_OPT]] : $Optional<AnyObject>
     // CHECK: cond_br [[HAS_EMBEDDED_RESULT]], [[SUCCESS:bb[0-9]+]], [[FAILURE:bb[0-9]+]]