ASTMangler: Remove an unused parameter

Author: slavapestov

include/swift/AST/ASTMangler.h

@@ -443,8 +443,7 @@ class ASTMangler : public Mangler {
   /// Append any retroactive conformances.
   void appendRetroactiveConformances(Type type, GenericSignature sig);
   void appendRetroactiveConformances(SubstitutionMap subMap,
-                                     GenericSignature sig,
-                                     ModuleDecl *fromModule);
+                                     GenericSignature sig);
   void appendImplFunctionType(SILFunctionType *fn, GenericSignature sig,
                               const ValueDecl *forDecl = nullptr);
   void appendOpaqueTypeArchetype(ArchetypeType *archetype,

lib/AST/ASTMangler.cpp

@@ -1875,14 +1875,13 @@ static bool isRetroactiveConformance(const RootProtocolConformance *root) {
 /// Determine whether the given protocol conformance contains a retroactive
 /// protocol conformance anywhere in it.
 static bool containsRetroactiveConformance(
-                                      ProtocolConformanceRef conformanceRef,
-                                      ModuleDecl *module) {
+                                      ProtocolConformanceRef conformanceRef) {
   if (!conformanceRef.isPack() && !conformanceRef.isConcrete())
     return false;
 
   if (conformanceRef.isPack()) {
     for (auto patternConf : conformanceRef.getPack()->getPatternConformances()) {
-      if (containsRetroactiveConformance(patternConf, module))
+      if (containsRetroactiveConformance(patternConf))
         return true;
     }
 
@@ -1912,7 +1911,7 @@ static bool containsRetroactiveConformance(
       // for indexing purposes.
       continue;
     }
-    if (containsRetroactiveConformance(conformance, module)) {
+    if (containsRetroactiveConformance(conformance)) {
       return true;
     }
   }
@@ -1921,8 +1920,7 @@ static bool containsRetroactiveConformance(
 }
 
 void ASTMangler::appendRetroactiveConformances(SubstitutionMap subMap,
-                                               GenericSignature sig,
-                                               ModuleDecl *fromModule) {
+                                               GenericSignature sig) {
   if (subMap.empty()) return;
 
   unsigned numProtocolRequirements = 0;
@@ -1942,7 +1940,7 @@ void ASTMangler::appendRetroactiveConformances(SubstitutionMap subMap,
       continue;
 
     // Skip non-retroactive conformances.
-    if (!containsRetroactiveConformance(conformance, fromModule))
+    if (!containsRetroactiveConformance(conformance))
       continue;
 
     if (conformance.isConcrete())
@@ -1972,7 +1970,7 @@ void ASTMangler::appendRetroactiveConformances(Type type, GenericSignature sig)
     subMap = type->getContextSubstitutionMap(module, nominal);
   }
 
-  appendRetroactiveConformances(subMap, sig, module);
+  appendRetroactiveConformances(subMap, sig);
 }
 
 void ASTMangler::appendSymbolicExtendedExistentialType(
@@ -1995,11 +1993,7 @@ void ASTMangler::appendSymbolicExtendedExistentialType(
     for (auto argType : genInfo.Generalization.getReplacementTypes())
       appendType(argType, sig, forDecl);
 
-    // What module should be used here?  The existential isn't anchored
-    // to any given module; we should just treat conformances as
-    // retroactive if they're "objectively" retroactive.
-    appendRetroactiveConformances(genInfo.Generalization, sig,
-                                  /*from module*/ nullptr);
+    appendRetroactiveConformances(genInfo.Generalization, sig);
   }
 
   appendOperator("Xj");
@@ -2190,7 +2184,7 @@ void ASTMangler::appendImplFunctionType(SILFunctionType *fn,
   }
   if (auto subs = fn->getInvocationSubstitutions()) {
     appendFlatGenericArgs(subs, sig, forDecl);
-    appendRetroactiveConformances(subs, sig, Mod);
+    appendRetroactiveConformances(subs, sig);
   }
   if (auto subs = fn->getPatternSubstitutions()) {
     appendGenericSignature(subs.getGenericSignature());
@@ -2199,7 +2193,7 @@ void ASTMangler::appendImplFunctionType(SILFunctionType *fn,
         ? fn->getInvocationGenericSignature()
         : outerGenericSig;
     appendFlatGenericArgs(subs, sig, forDecl);
-    appendRetroactiveConformances(subs, sig, Mod);
+    appendRetroactiveConformances(subs, sig);
   }
 
   OpArgs.push_back('_');
@@ -2235,7 +2229,7 @@ void ASTMangler::appendOpaqueTypeArchetype(ArchetypeType *archetype,
     appendOpaqueDeclName(opaqueDecl);
     bool isFirstArgList = true;
     appendBoundGenericArgs(opaqueDecl, sig, subs, isFirstArgList, forDecl);
-    appendRetroactiveConformances(subs, sig, opaqueDecl->getParentModule());
+    appendRetroactiveConformances(subs, sig);
 
     appendOperator("Qo", Index(genericParam->getIndex()));
   } else {