[DNM] Fix bridging to work with a split Foundation module

Author: millenomi

include/swift/AST/KnownIdentifiers.def

@@ -59,6 +59,9 @@ IDENTIFIER(error)
 IDENTIFIER(errorDomain)
 IDENTIFIER(forKeyedSubscript)
 IDENTIFIER(Foundation)
+IDENTIFIER(SwiftFoundation)
+IDENTIFIER(FoundationSoil)
+IDENTIFIER(SwiftFoundationSoil)
 IDENTIFIER(for)
 IDENTIFIER(forKey)
 IDENTIFIER(from)

include/swift/SIL/BridgedTypes.def

@@ -34,15 +34,19 @@
 #define BRIDGING_KNOWN_TYPE(module, type)
 #endif
 
+#ifndef BRIDGING_KNOWN_TYPE_WITH_MODULES_4
+#define BRIDGING_KNOWN_TYPE_WITH_MODULES_4(module1, module2, module3, module4, type)
+#endif
+
 #ifndef BRIDGE_TYPE
 #define BRIDGE_TYPE(bmodule, btype, nmodule, ntype, opt)
 #endif
 
-BRIDGING_KNOWN_TYPE(Foundation, NSString)
-BRIDGING_KNOWN_TYPE(Foundation, NSArray)
-BRIDGING_KNOWN_TYPE(Foundation, NSDictionary)
-BRIDGING_KNOWN_TYPE(Foundation, NSSet)
-BRIDGING_KNOWN_TYPE(Foundation, NSError)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSString)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSArray)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSDictionary)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSSet)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSError)
 BRIDGING_KNOWN_TYPE(Swift, String)
 BRIDGING_KNOWN_TYPE(ObjectiveC, ObjCBool)
 BRIDGING_KNOWN_TYPE(ObjectiveC, Selector)
@@ -55,4 +59,4 @@ BRIDGE_TYPE(Darwin, DarwinBoolean, Swift, Bool, false)
 
 #undef BRIDGING_KNOWN_TYPE
 #undef BRIDGE_TYPE
-
+#undef BRIDGING_KNOWN_TYPE_WITH_MODULES_4

include/swift/SIL/TypeLowering.h

@@ -697,6 +697,8 @@ class TypeConverter {
   // Types converted during foreign bridging.
 #define BRIDGING_KNOWN_TYPE(BridgedModule,BridgedType) \
   Optional<CanType> BridgedType##Ty;
+#define BRIDGING_KNOWN_TYPE_WITH_MODULES_4(_1, _2, _3, _4, BridgedType) \
+  Optional<CanType> BridgedType##Ty;
 #include "swift/SIL/BridgedTypes.def"
 
   const TypeLowering &
@@ -950,6 +952,8 @@ class TypeConverter {
   /// Known types for bridging.
 #define BRIDGING_KNOWN_TYPE(BridgedModule,BridgedType) \
   CanType get##BridgedType##Type();
+#define BRIDGING_KNOWN_TYPE_WITH_MODULES_4(_1, _2, _3, _4, BridgedType) \
+  CanType get##BridgedType##Type();
 #include "swift/SIL/BridgedTypes.def"
 
   /// Get the capture list from a closure, with transitive function captures

lib/AST/ASTContext.cpp

@@ -848,7 +848,17 @@ StructDecl *ASTContext::getObjCBoolDecl() const {
 #define GET_FOUNDATION_DECL(NAME) \
 ClassDecl *ASTContext::get##NAME##Decl() const { \
   if (!getImpl().NAME##Decl) { \
-    if (ModuleDecl *M = getLoadedModule(Id_Foundation)) { \
+    ModuleDecl *M = getLoadedModule(Id_SwiftFoundationSoil); \
+    if (!M) { \
+      M = getLoadedModule(Id_SwiftFoundation); \
+    } \
+    if (!M) { \
+      M = getLoadedModule(Id_FoundationSoil); \
+    } \
+    if (!M) { \
+      M = getLoadedModule(Id_Foundation); \
+    } \
+    if (M) { \
       /* Note: use unqualified lookup so we find NSError regardless of */ \
       /* whether it's defined in the Foundation module or the Clang */ \
       /* Foundation module it imports. */ \

lib/SIL/SILFunctionType.cpp

@@ -173,11 +173,43 @@ static CanType getKnownType(Optional<CanType> &cacheSlot, ASTContext &C,
   return t;
 }
 
+static CanType getKnownTypeFromModules4(Optional<CanType> &cacheSlot, ASTContext &C,
+                                        StringRef moduleName1, StringRef moduleName2,
+                                        StringRef moduleName3, StringRef moduleName4,
+                                        StringRef typeName) {
+
+  auto temporaryCacheSlot = Optional<CanType>();
+  auto T = getKnownType(temporaryCacheSlot, C, moduleName1, typeName);
+  
+  if (!T) {
+    temporaryCacheSlot = Optional<CanType>();
+    T = getKnownType(temporaryCacheSlot, C, moduleName2, typeName);
+  }
+  if (!T) {
+    temporaryCacheSlot = Optional<CanType>();
+    T = getKnownType(temporaryCacheSlot, C, moduleName3, typeName);
+  }
+  if (!T) {
+    temporaryCacheSlot = Optional<CanType>();
+    T = getKnownType(temporaryCacheSlot, C, moduleName4, typeName);
+  }
+  
+  cacheSlot = temporaryCacheSlot;
+  return T;
+}
+
 #define BRIDGING_KNOWN_TYPE(BridgedModule,BridgedType) \
   CanType TypeConverter::get##BridgedType##Type() {         \
     return getKnownType(BridgedType##Ty, M.getASTContext(), \
                         #BridgedModule, #BridgedType);      \
   }
+#define BRIDGING_KNOWN_TYPE_WITH_MODULES_4(BridgedModule1,BridgedModule2,BridgedModule3,BridgedModule4,BridgedType) \
+  CanType TypeConverter::get##BridgedType##Type() { \
+    return getKnownTypeFromModules4(BridgedType##Ty, M.getASTContext(), \
+                                    #BridgedModule1, #BridgedModule2, \
+                                    #BridgedModule3, #BridgedModule4, \
+                                    #BridgedType); \
+  }
 #include "swift/SIL/BridgedTypes.def"
 
 /// Adjust a function type to have a slightly different type.

lib/Sema/CSSimplify.cpp

@@ -3539,7 +3539,12 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
   // a lookup into that Objective-C type.
   if (bridgedType) {
     LookupResult &bridgedLookup = lookupMember(bridgedType, memberName);
+
     ModuleDecl *foundationModule = nullptr;
+    ModuleDecl *foundationSoilModule = nullptr;
+    ModuleDecl *swiftFoundationModule = nullptr;
+    ModuleDecl *swiftFoundationSoilModule = nullptr;
+
     for (auto result : bridgedLookup) {
       // Ignore results from the Objective-C "Foundation"
       // module. Those core APIs are explicitly provided by the
@@ -3556,6 +3561,39 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
         continue;
       }
 
+      if (foundationSoilModule) {
+        if (module == foundationSoilModule)
+          continue;
+      } else if (ClangModuleUnit::hasClangModule(module) &&
+                 module->getName().str() == "FoundationSoil") {
+        // Cache the foundation module name so we don't need to look
+        // for it again.
+        foundationSoilModule = module;
+        continue;
+      }
+      
+      if (swiftFoundationModule) {
+        if (module == swiftFoundationModule)
+          continue;
+      } else if (ClangModuleUnit::hasClangModule(module) &&
+                 module->getName().str() == "SwiftFoundation") {
+        // Cache the foundation module name so we don't need to look
+        // for it again.
+        swiftFoundationModule = module;
+        continue;
+      }
+      
+      if (swiftFoundationSoilModule) {
+        if (module == swiftFoundationSoilModule)
+          continue;
+      } else if (ClangModuleUnit::hasClangModule(module) &&
+                 module->getName().str() == "SwiftFoundationSoil") {
+        // Cache the foundation module name so we don't need to look
+        // for it again.
+        swiftFoundationSoilModule = module;
+        continue;
+      }
+      
       addChoice(getOverloadChoice(result.getValueDecl(),
                                   /*isBridged=*/true,
                                   /*isUnwrappedOptional=*/false));

stdlib/public/core/BridgeObjectiveC.swift

@@ -658,7 +658,7 @@ extension Optional: _Unwrappable {
   }
 }
 
-private let _foundationSwiftValueType = _typeByName("Foundation.__SwiftValue") as? _NSSwiftValue.Type
+private let _foundationSwiftValueType = _typeByName("FoundationSoil.__SwiftValue") as? _NSSwiftValue.Type
 
 @usableFromInline
 internal var _nullPlaceholder: AnyObject {