AST: Rename ProtocolConformance::getSubstitutions() to getSubstitutionMap() and remove ModuleDecl parameter

Author: slavapestov

include/swift/AST/ProtocolConformance.h

@@ -254,8 +254,8 @@ class alignas(1 << DeclAlignInBits) ProtocolConformance
   /// interface type.
   GenericSignature getGenericSignature() const;
 
-  /// Get the substitutions associated with this conformance.
-  SubstitutionMap getSubstitutions(ModuleDecl *M) const;
+  /// Get the conformance substitution map.
+  SubstitutionMap getSubstitutionMap() const;
 
   /// Get the underlying normal conformance.
   /// FIXME: remove uses of this.
@@ -343,6 +343,9 @@ class RootProtocolConformance : public ProtocolConformance {
   /// TODO: maybe this should return a Witness?
   ConcreteDeclRef getWitnessDeclRef(ValueDecl *requirement) const;
 
+  /// Get the conformance substitution map.
+  SubstitutionMap getSubstitutionMap() const;
+
   /// Apply the given function object to each value witness within this
   /// protocol conformance.
   ///
@@ -910,6 +913,11 @@ class InheritedProtocolConformance : public ProtocolConformance,
     return InheritedConformance;
   }
 
+  /// Get the conformance substitution map.
+  SubstitutionMap getSubstitutionMap() const {
+    return InheritedConformance->getSubstitutionMap();
+  }
+
   /// Get the protocol being conformed to.
   ProtocolDecl *getProtocol() const {
     return InheritedConformance->getProtocol();

lib/AST/ASTMangler.cpp

@@ -1812,7 +1812,7 @@ static bool containsRetroactiveConformance(
 
   // If the conformance is conditional and any of the substitutions used to
   // satisfy the conditions are retroactive, it's retroactive.
-  auto subMap = conformance->getSubstitutions(module);
+  auto subMap = conformance->getSubstitutionMap();
   for (auto requirement : rootConformance->getConditionalRequirements()) {
     if (requirement.getKind() != RequirementKind::Conformance)
       continue;

lib/AST/ProtocolConformance.cpp

@@ -220,17 +220,12 @@ GenericSignature ProtocolConformance::getGenericSignature() const {
   llvm_unreachable("Unhandled ProtocolConformanceKind in switch.");
 }
 
-SubstitutionMap ProtocolConformance::getSubstitutions(ModuleDecl *M) const {
-  const ProtocolConformance *conformance = this;
-
-  if (auto *inheritedC = dyn_cast<InheritedProtocolConformance>(conformance))
-    conformance = inheritedC->getInheritedConformance();
-
-  if (auto *specializedC = dyn_cast<SpecializedProtocolConformance>(conformance))
-    return specializedC->getSubstitutionMap();
+SubstitutionMap ProtocolConformance::getSubstitutionMap() const {
+  CONFORMANCE_SUBCLASS_DISPATCH(getSubstitutionMap, ())
+}
 
-  auto *rootC = cast<RootProtocolConformance>(conformance);
-  if (auto genericSig = rootC->getGenericSignature())
+SubstitutionMap RootProtocolConformance::getSubstitutionMap() const {
+  if (auto genericSig = getGenericSignature())
     return genericSig->getIdentitySubstitutionMap();
 
   return SubstitutionMap();

lib/AST/ProtocolConformanceRef.cpp

@@ -286,8 +286,7 @@ bool ProtocolConformanceRef::hasUnavailableConformance() const {
     return true;
 
   // Check the conformances in the substitution map.
-  auto module = concrete->getDeclContext()->getParentModule();
-  auto subMap = concrete->getSubstitutions(module);
+  auto subMap = concrete->getSubstitutionMap();
   for (auto subConformance : subMap.getConformances()) {
     if (subConformance.hasUnavailableConformance())
       return true;
@@ -327,7 +326,7 @@ bool ProtocolConformanceRef::forEachMissingConformance(
   }
 
   // Check conformances that are part of this conformance.
-  auto subMap = concreteConf->getSubstitutions(module);
+  auto subMap = concreteConf->getSubstitutionMap();
   for (auto conformance : subMap.getConformances()) {
     if (conformance.forEachMissingConformance(module, fn))
       return true;

lib/ClangImporter/ClangDerivedConformances.cpp

@@ -79,7 +79,7 @@ static bool isConcreteAndValid(ProtocolConformanceRef conformanceRef,
   if (!conformanceRef.isConcrete())
     return false;
   auto conformance = conformanceRef.getConcrete();
-  auto subMap = conformance->getSubstitutions(module);
+  auto subMap = conformance->getSubstitutionMap();
   return llvm::all_of(subMap.getConformances(),
                       [&](ProtocolConformanceRef each) -> bool {
                         return isConcreteAndValid(each, module);

lib/IRGen/GenProto.cpp

@@ -1067,8 +1067,7 @@ emitConditionalConformancesBuffer(IRGenFunction &IGF,
   // in the buffer that gets passed to the witness table accessor.
   llvm::SmallVector<llvm::Value *, 4> tables;
 
-  auto subMap = substConformance->getSubstitutions(IGF.IGM.getSwiftModule());
-
+  auto subMap = substConformance->getSubstitutionMap();
   SILWitnessTable::enumerateWitnessTableConditionalConformances(
       rootConformance, [&](unsigned, CanType type, ProtocolDecl *proto) {
         auto substType = type.subst(subMap)->getCanonicalType();

lib/SILOptimizer/Utils/Devirtualize.cpp

@@ -894,16 +894,14 @@ std::pair<FullApplySite, bool> swift::tryDevirtualizeClassMethod(
 /// \param classWitness The ClassDecl if this is a class witness method
 static SubstitutionMap
 getWitnessMethodSubstitutions(
-    ModuleDecl *mod,
+    ASTContext &ctx,
     ProtocolConformanceRef conformanceRef,
     GenericSignature requirementSig,
     GenericSignature witnessThunkSig,
     SubstitutionMap origSubMap,
     bool isSelfAbstract,
     ClassDecl *classWitness) {
 
-  auto &ctx = mod->getASTContext();
-
   if (witnessThunkSig.isNull())
     return SubstitutionMap();
 
@@ -917,7 +915,7 @@ getWitnessMethodSubstitutions(
 
   // If `Self` maps to a bound generic type, this gives us the
   // substitutions for the concrete type's generic parameters.
-  auto baseSubMap = conformance->getSubstitutions(mod);
+  auto baseSubMap = conformance->getSubstitutionMap();
 
   unsigned baseDepth = 0;
   auto *rootConformance = conformance->getRootConformance();
@@ -1023,7 +1021,7 @@ swift::getWitnessMethodSubstitutions(SILModule &module, ApplySite applySite,
 
   SubstitutionMap origSubs = applySite.getSubstitutionMap();
 
-  auto *mod = module.getSwiftModule();
+  auto &ctx = module.getASTContext();
   bool isSelfAbstract =
       witnessFnTy
           ->getSelfInstanceType(
@@ -1032,7 +1030,7 @@ swift::getWitnessMethodSubstitutions(SILModule &module, ApplySite applySite,
   auto *classWitness = witnessFnTy->getWitnessMethodClass(
       module, applySite.getFunction()->getTypeExpansionContext());
 
-  return ::getWitnessMethodSubstitutions(mod, cRef, requirementSig,
+  return ::getWitnessMethodSubstitutions(ctx, cRef, requirementSig,
                                          witnessThunkSig, origSubs,
                                          isSelfAbstract, classWitness);
 }

lib/Sema/TypeCheckAvailability.cpp

@@ -4219,8 +4219,7 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
   }
 
   // Now, check associated conformances.
-  SubstitutionMap subConformanceSubs =
-      concreteConf->getSubstitutions(DC->getParentModule());
+  SubstitutionMap subConformanceSubs = concreteConf->getSubstitutionMap();
   if (diagnoseSubstitutionMapAvailability(loc, subConformanceSubs, where,
                                           depTy, replacementTy,
                                           useConformanceAvailabilityErrorsOption))

lib/Sema/TypeCheckEffects.cpp

@@ -155,7 +155,7 @@ static bool classifyWitness(ModuleDecl *module,
     case PolymorphicEffectKind::ByConformance: {
       // Witness has the effect if the concrete type's conformances
       // recursively have the effect.
-      auto substitutions = conformance->getSubstitutions(module);
+      auto substitutions = conformance->getSubstitutionMap();
       for (auto conformanceRef : substitutions.getConformances()) {
         if (conformanceRef.hasEffect(kind)) {
           return true;