Remove the specialness from SwiftFoundationBase and SwiftFoundation re: bridged types. This isn’t great, but restores the functioning status quo.

Author: millenomi

include/swift/AST/KnownIdentifiers.def

@@ -59,9 +59,7 @@ IDENTIFIER(error)
 IDENTIFIER(errorDomain)
 IDENTIFIER(forKeyedSubscript)
 IDENTIFIER(Foundation)
-IDENTIFIER(SwiftFoundation)
 IDENTIFIER(FoundationBase)
-IDENTIFIER(SwiftFoundationBase)
 IDENTIFIER(for)
 IDENTIFIER(forKey)
 IDENTIFIER(from)

include/swift/SIL/BridgedTypes.def

@@ -34,19 +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)
+#ifndef BRIDGING_KNOWN_TYPE_WITH_MODULES_2
+#define BRIDGING_KNOWN_TYPE_WITH_MODULES_2(module1, module2, type)
 #endif
 
 #ifndef BRIDGE_TYPE
 #define BRIDGE_TYPE(bmodule, btype, nmodule, ntype, opt)
 #endif
 
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSString)
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSArray)
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSDictionary)
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSSet)
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSError)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_2(FoundationBase, Foundation, NSString)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_2(FoundationBase, Foundation, NSArray)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_2(FoundationBase, Foundation, NSDictionary)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_2(FoundationBase, Foundation, NSSet)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_2(FoundationBase, Foundation, NSError)
 BRIDGING_KNOWN_TYPE(Swift, String)
 BRIDGING_KNOWN_TYPE(ObjectiveC, ObjCBool)
 BRIDGING_KNOWN_TYPE(ObjectiveC, Selector)
@@ -59,4 +59,4 @@ BRIDGE_TYPE(Darwin, DarwinBoolean, Swift, Bool, false)
 
 #undef BRIDGING_KNOWN_TYPE
 #undef BRIDGE_TYPE
-#undef BRIDGING_KNOWN_TYPE_WITH_MODULES_4
+#undef BRIDGING_KNOWN_TYPE_WITH_MODULES_2

include/swift/SIL/TypeLowering.h

@@ -697,7 +697,7 @@ 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) \
+#define BRIDGING_KNOWN_TYPE_WITH_MODULES_2(_1, _2, BridgedType) \
   Optional<CanType> BridgedType##Ty;
 #include "swift/SIL/BridgedTypes.def"
 
@@ -952,7 +952,7 @@ 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) \
+#define BRIDGING_KNOWN_TYPE_WITH_MODULES_2(_1, _2, BridgedType) \
   CanType get##BridgedType##Type();
 #include "swift/SIL/BridgedTypes.def"
 

lib/AST/ASTContext.cpp

@@ -848,13 +848,7 @@ StructDecl *ASTContext::getObjCBoolDecl() const {
 #define GET_FOUNDATION_DECL(NAME) \
 ClassDecl *ASTContext::get##NAME##Decl() const { \
   if (!getImpl().NAME##Decl) { \
-    ModuleDecl *M = getLoadedModule(Id_SwiftFoundationBase); \
-    if (!M) { \
-      M = getLoadedModule(Id_SwiftFoundation); \
-    } \
-    if (!M) { \
-      M = getLoadedModule(Id_FoundationBase); \
-    } \
+    ModuleDecl *M = getLoadedModule(Id_FoundationBase); \
     if (!M) { \
       M = getLoadedModule(Id_Foundation); \
     } \

lib/SIL/SILFunctionType.cpp

@@ -173,9 +173,8 @@ static CanType getKnownType(Optional<CanType> &cacheSlot, ASTContext &C,
   return t;
 }
 
-static CanType getKnownTypeFromModules4(Optional<CanType> &cacheSlot, ASTContext &C,
+static CanType getKnownTypeFromModules2(Optional<CanType> &cacheSlot, ASTContext &C,
                                         StringRef moduleName1, StringRef moduleName2,
-                                        StringRef moduleName3, StringRef moduleName4,
                                         StringRef typeName) {
 
   auto temporaryCacheSlot = Optional<CanType>();
@@ -185,14 +184,6 @@ static CanType getKnownTypeFromModules4(Optional<CanType> &cacheSlot, ASTContext
     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;
@@ -203,11 +194,10 @@ static CanType getKnownTypeFromModules4(Optional<CanType> &cacheSlot, ASTContext
     return getKnownType(BridgedType##Ty, M.getASTContext(), \
                         #BridgedModule, #BridgedType);      \
   }
-#define BRIDGING_KNOWN_TYPE_WITH_MODULES_4(BridgedModule1,BridgedModule2,BridgedModule3,BridgedModule4,BridgedType) \
+#define BRIDGING_KNOWN_TYPE_WITH_MODULES_2(BridgedModule1,BridgedModule2,BridgedType) \
   CanType TypeConverter::get##BridgedType##Type() { \
-    return getKnownTypeFromModules4(BridgedType##Ty, M.getASTContext(), \
+    return getKnownTypeFromModules2(BridgedType##Ty, M.getASTContext(), \
                                     #BridgedModule1, #BridgedModule2, \
-                                    #BridgedModule3, #BridgedModule4, \
                                     #BridgedType); \
   }
 #include "swift/SIL/BridgedTypes.def"