IRGen: Don't pass around a ModuleDecl for mangling typerefs

Author: slavapestov

lib/IRGen/GenReflection.cpp

@@ -203,16 +203,15 @@ class ReflectionMetadataBuilder {
 
   /// Add a 32-bit relative offset to a mangled typeref string
   /// in the typeref reflection section.
-  void addTypeRef(ModuleDecl *ModuleContext, CanType type) {
+  void addTypeRef(CanType type) {
     assert(type);
 
     // Generic parameters should be written in terms of interface types
     // for the purposes of reflection metadata
     assert(!type->hasArchetype() && "Forgot to map typeref out of context");
 
     IRGenMangler mangler;
-    auto MangledStr = mangler.mangleTypeForReflection(IGM, type,
-                                                      ModuleContext);
+    auto MangledStr = mangler.mangleTypeForReflection(IGM, type);
     auto mangledName = IGM.getAddrOfStringForTypeRef(MangledStr);
     B.addRelativeAddress(mangledName);
   }
@@ -227,7 +226,7 @@ class ReflectionMetadataBuilder {
     } else {
       CanType type = nominal->getDeclaredType()->getCanonicalType();
       mangledStr =
-        mangler.mangleTypeForReflection(IGM, type, nominal->getModuleContext());
+        mangler.mangleTypeForReflection(IGM, type);
     }
     auto mangledName = IGM.getAddrOfStringForTypeRef(mangledStr);
     B.addRelativeAddress(mangledName);
@@ -284,9 +283,7 @@ class AssociatedTypeMetadataBuilder : public ReflectionMetadataBuilder {
     PrettyStackTraceDecl DebugStack("emitting associated type metadata",
                                     Nominal);
 
-    auto *M = IGM.getSILModule().getSwiftModule();
-
-    addTypeRef(M, Nominal->getDeclaredType()->getCanonicalType());
+    addTypeRef(Nominal->getDeclaredType()->getCanonicalType());
     addNominalRef(Conformance->getProtocol());
 
     B.addInt32(AssociatedTypes.size());
@@ -296,7 +293,7 @@ class AssociatedTypeMetadataBuilder : public ReflectionMetadataBuilder {
       auto NameGlobal = IGM.getAddrOfFieldName(AssocTy.first);
       B.addRelativeAddress(NameGlobal);
       addBuiltinTypeRefs(AssocTy.second);
-      addTypeRef(M, AssocTy.second);
+      addTypeRef(AssocTy.second);
     }
   }
 
@@ -330,7 +327,7 @@ class FieldTypeMetadataBuilder : public ReflectionMetadataBuilder {
     if (!type) {
       B.addInt32(0);
     } else {
-      addTypeRef(value->getModuleContext(), type);
+      addTypeRef(type);
       addBuiltinTypeRefs(type);
     }
 
@@ -436,8 +433,7 @@ class FieldTypeMetadataBuilder : public ReflectionMetadataBuilder {
 
     auto *CD = dyn_cast<ClassDecl>(NTD);
     if (CD && CD->getSuperclass()) {
-      addTypeRef(NTD->getModuleContext(),
-                 CD->getSuperclass()->getCanonicalType());
+      addTypeRef(CD->getSuperclass()->getCanonicalType());
     } else {
       B.addInt32(0);
     }
@@ -499,7 +495,7 @@ class FixedTypeMetadataBuilder : public ReflectionMetadataBuilder {
   }
 
   void layout() override {
-    addTypeRef(module, type);
+    addTypeRef(type);
 
     B.addInt32(ti->getFixedSize().getValue());
     B.addInt32(ti->getFixedAlignment().getValue());
@@ -549,7 +545,7 @@ class BoxDescriptorBuilder : public ReflectionMetadataBuilder {
     B.addInt32(0); // Number of sources
     B.addInt32(0); // Number of generic bindings
 
-    addTypeRef(IGM.getSILModule().getSwiftModule(), BoxedType);
+    addTypeRef(BoxedType);
     addBuiltinTypeRefs(BoxedType);
   }
 
@@ -742,7 +738,7 @@ class CaptureDescriptorBuilder : public ReflectionMetadataBuilder {
 
     // Now add typerefs of all of the captures.
     for (auto CaptureType : CaptureTypes) {
-      addTypeRef(IGM.getSILModule().getSwiftModule(), CaptureType);
+      addTypeRef(CaptureType);
       addBuiltinTypeRefs(CaptureType);
     }
 
@@ -752,7 +748,7 @@ class CaptureDescriptorBuilder : public ReflectionMetadataBuilder {
       auto GenericParam = GenericAndSource.first->getCanonicalType();
       auto Source = GenericAndSource.second;
 
-      addTypeRef(nullptr, GenericParam);
+      addTypeRef(GenericParam);
       addMetadataSource(Source);
     }
   }

lib/IRGen/IRGenMangler.cpp

@@ -81,9 +81,8 @@ std::string IRGenMangler::manglePartialApplyForwarder(StringRef FuncName) {
 
 SymbolicMangling
 IRGenMangler::mangleTypeForReflection(IRGenModule &IGM,
-                                      Type Ty,
-                                      ModuleDecl *Module) {
-  Mod = Module;
+                                      Type Ty) {
+  Mod = IGM.getSwiftModule();
   OptimizeProtocolNames = false;
 
   llvm::SaveAndRestore<std::function<bool (const DeclContext *)>>

lib/IRGen/IRGenMangler.h

@@ -354,8 +354,7 @@ class IRGenMangler : public Mangle::ASTMangler {
   }
 
   SymbolicMangling mangleTypeForReflection(IRGenModule &IGM,
-                                           Type Ty,
-                                           ModuleDecl *Module);
+                                           Type Ty);
 
   std::string mangleTypeForLLVMTypeName(CanType Ty);
 

lib/IRGen/MetadataRequest.cpp

@@ -302,8 +302,7 @@ llvm::Constant *IRGenModule::getAddrOfStringForTypeRef(
 // It should be removed when fixed. rdar://problem/22674524
 llvm::Constant *irgen::getTypeRef(IRGenModule &IGM, CanType type) {
   IRGenMangler Mangler;
-  auto SymbolicName = Mangler.mangleTypeForReflection(IGM, type,
-                                                    IGM.getSwiftModule());
+  auto SymbolicName = Mangler.mangleTypeForReflection(IGM, type);
 
   return IGM.getAddrOfStringForTypeRef(SymbolicName);
 }