RequirementMachine: Rename remapConcreteSubstitutionSchema() to getRelativeSubstitutionSchemaFromType()

Author: slavapestov

lib/AST/RequirementMachine/InterfaceType.cpp

@@ -515,7 +515,7 @@ Type PropertyMap::getTypeFromSubstitutionSchema(
 /// the original substitutions {X.Y} to produce the new schema Foo<τ_0_0>
 /// with substitutions {X.Y.A.B}.
 CanType
-RewriteContext::remapConcreteSubstitutionSchema(
+RewriteContext::getRelativeSubstitutionSchemaFromType(
     CanType concreteType,
     ArrayRef<Term> substitutions,
     SmallVectorImpl<Term> &result) {

lib/AST/RequirementMachine/PropertyUnification.cpp

@@ -183,7 +183,7 @@ namespace {
                                                       lhsSubstitutions);
 
         SmallVector<Term, 3> result;
-        auto concreteType = ctx.remapConcreteSubstitutionSchema(
+        auto concreteType = ctx.getRelativeSubstitutionSchemaFromType(
             CanType(secondType), rhsSubstitutions, result);
 
         MutableTerm constraintTerm(subjectTerm);
@@ -204,7 +204,7 @@ namespace {
                                                       rhsSubstitutions);
 
         SmallVector<Term, 3> result;
-        auto concreteType = ctx.remapConcreteSubstitutionSchema(
+        auto concreteType = ctx.getRelativeSubstitutionSchemaFromType(
             CanType(firstType), lhsSubstitutions, result);
 
         MutableTerm constraintTerm(subjectTerm);
@@ -842,8 +842,8 @@ MutableTerm PropertyMap::computeConstraintTermForTypeWitness(
   // Compute the concrete type symbol [concrete: C.X].
   SmallVector<Term, 3> result;
   auto typeWitnessSchema =
-      Context.remapConcreteSubstitutionSchema(typeWitness, substitutions,
-                                              result);
+      Context.getRelativeSubstitutionSchemaFromType(typeWitness, substitutions,
+                                                    result);
   auto typeWitnessSymbol =
       Symbol::forConcreteType(typeWitnessSchema, result, Context);
 

lib/AST/RequirementMachine/RewriteContext.h

@@ -174,9 +174,9 @@ class RewriteContext final {
                                         const ProtocolDecl *proto,
                                         SmallVectorImpl<Term> &result);
 
-  CanType remapConcreteSubstitutionSchema(CanType concreteType,
-                                          ArrayRef<Term> substitutions,
-                                          SmallVectorImpl<Term> &result);
+  CanType getRelativeSubstitutionSchemaFromType(CanType concreteType,
+                                                ArrayRef<Term> substitutions,
+                                                SmallVectorImpl<Term> &result);
 
   AssociatedTypeDecl *getAssociatedTypeForSymbol(Symbol symbol);