AST: Rename mapConformanceOutOfContext() => mapConformanceOutOfEnvironment(), mapReplacementTypesOutOfContext() => subs.mapReplacementTypesOutOfEnvironment()

slavapestov · slavapestov · commit 9393a119295f · 2025-11-13T17:52:15.000-05:00
diff --git a/include/swift/AST/ProtocolConformanceRef.h b/include/swift/AST/ProtocolConformanceRef.h
@@ -199,7 +199,7 @@ class ProtocolConformanceRef {
   ProtocolConformanceRef subst(InFlightSubstitution &IFS) const;
 
   /// Map contextual types to interface types in the conformance.
-  ProtocolConformanceRef mapConformanceOutOfContext() const;
+  ProtocolConformanceRef mapConformanceOutOfEnvironment() const;
 
   /// Look up the type witness for an associated type declaration in this
   /// conformance.
diff --git a/include/swift/AST/SubstitutionMap.h b/include/swift/AST/SubstitutionMap.h
@@ -209,7 +209,7 @@ class SubstitutionMap {
 
   /// Swap archetypes in the substitution map's replacement types with their
   /// interface types.
-  SubstitutionMap mapReplacementTypesOutOfContext() const;
+  SubstitutionMap mapReplacementTypesOutOfEnvironment() const;
 
   /// Verify that the conformances stored in this substitution map match the
   /// replacement types provided.
diff --git a/include/swift/SIL/TypeSubstCloner.h b/include/swift/SIL/TypeSubstCloner.h
@@ -416,7 +416,7 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
         });
       }
 
-      SubsMap = SubsMap.mapReplacementTypesOutOfContext();
+      SubsMap = SubsMap.mapReplacementTypesOutOfEnvironment();
     }
 
     // One abstract function in the debug info can only have one set of variables
@@ -427,7 +427,7 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
         !SubsMap.getRecursiveProperties().hasTypeParameter())
       return ParentFunction;
 
-    // Note that mapReplacementTypesOutOfContext() can't do anything for
+    // Note that mapReplacementTypesOutOfEnvironment() can't do anything for
     // opened existentials, and since archetypes can't be mangled, ignore
     // this case for now.
     if (SubsMap.getRecursiveProperties().hasLocalArchetype())
diff --git a/lib/AST/ProtocolConformanceRef.cpp b/lib/AST/ProtocolConformanceRef.cpp
@@ -114,7 +114,7 @@ ProtocolConformanceRef::subst(InFlightSubstitution &IFS) const {
   return IFS.lookupConformance(origType, proto, /*level=*/0);
 }
 
-ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() const {
+ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfEnvironment() const {
   if (isConcrete()) {
     return getConcrete()->subst(
         MapTypeOutOfContext(),
diff --git a/lib/AST/SubstitutionMap.cpp b/lib/AST/SubstitutionMap.cpp
@@ -290,7 +290,7 @@ SubstitutionMap::lookupConformance(CanType type, ProtocolDecl *proto) const {
   return conformance;
 }
 
-SubstitutionMap SubstitutionMap::mapReplacementTypesOutOfContext() const {
+SubstitutionMap SubstitutionMap::mapReplacementTypesOutOfEnvironment() const {
   return subst(MapTypeOutOfContext(),
                LookUpConformanceInModule(),
                SubstFlags::PreservePackExpansionLevel |
@@ -419,7 +419,7 @@ OverrideSubsInfo::OverrideSubsInfo(const NominalTypeDecl *baseNominal,
     BaseSubMap = derivedNominalTy->getContextSubstitutionMap(
         baseNominal, genericEnv);
 
-    BaseSubMap = BaseSubMap.mapReplacementTypesOutOfContext();
+    BaseSubMap = BaseSubMap.mapReplacementTypesOutOfEnvironment();
   }
 
   if (auto derivedNominalSig = derivedNominal->getGenericSignature())
diff --git a/lib/SIL/Parser/ParseSIL.cpp b/lib/SIL/Parser/ParseSIL.cpp
@@ -2509,7 +2509,7 @@ SILParser::parseKeyPathPatternComponent(KeyPathPatternComponent &component,
           // Map the substitutions out of the pattern context so that they
           // use interface types.
           externalSubs =
-            externalSubs.mapReplacementTypesOutOfContext().getCanonical();
+            externalSubs.mapReplacementTypesOutOfEnvironment().getCanonical();
         }
 
       } else {
diff --git a/lib/SILGen/SILGenExpr.cpp b/lib/SILGen/SILGenExpr.cpp
@@ -4630,7 +4630,7 @@ static void lowerKeyPathMemberIndexPatterns(
     CanType formalTy;
     SILType loweredTy;
     std::tie(formalTy, loweredTy) = indexTypes[i];
-    auto hashable = indexHashables[i].mapConformanceOutOfContext();
+    auto hashable = indexHashables[i].mapConformanceOutOfEnvironment();
     assert(hashable.isAbstract() ||
            hashable.getConcrete()->getType()->isEqual(formalTy));
 
@@ -4814,7 +4814,7 @@ KeyPathPatternComponent SILGenModule::emitKeyPathComponentForDecl(
         if (externalSubs.getRecursiveProperties().hasArchetype()) {
           needsGenericContext = true;
           // FIXME: This doesn't do anything for local archetypes!
-          externalSubs = externalSubs.mapReplacementTypesOutOfContext();
+          externalSubs = externalSubs.mapReplacementTypesOutOfEnvironment();
         }
       }
 
diff --git a/lib/SILGen/SILGenType.cpp b/lib/SILGen/SILGenType.cpp
@@ -787,7 +787,7 @@ SILFunction *SILGenModule::emitProtocolWitness(
   if (conformance.isConcrete()) {
     conformance = reqtSubMap.lookupConformance(M.getASTContext().TheSelfType,
                                                origConformance.getProtocol())
-        .mapConformanceOutOfContext();
+        .mapConformanceOutOfEnvironment();
     ASSERT(!conformance.isAbstract());
 
     manglingConformance = conformance.getConcrete();
@@ -821,7 +821,7 @@ SILFunction *SILGenModule::emitProtocolWitness(
   if (auto accessor = dyn_cast<AccessorDecl>(requirement.getDecl())) {
     if (accessor->isCoroutine()) {
       witnessSubsForTypeLowering =
-        witness.getSubstitutions().mapReplacementTypesOutOfContext();
+        witness.getSubstitutions().mapReplacementTypesOutOfEnvironment();
       if (accessor->isRequirementWithSynthesizedDefaultImplementation())
         allowDuplicateThunk = true;
     }
diff --git a/lib/Sema/AssociatedTypeInference.cpp b/lib/Sema/AssociatedTypeInference.cpp
@@ -4588,7 +4588,7 @@ AssociatedConformanceRequest::evaluate(Evaluator &eval,
     substTy = conformance->getDeclContext()->mapTypeIntoEnvironment(substTy);
 
   return lookupConformance(substTy, reqProto, /*allowMissing=*/true)
-      .mapConformanceOutOfContext();
+      .mapConformanceOutOfEnvironment();
 }
 
 TinyPtrVector<AssociatedTypeDecl *>
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -9334,7 +9334,7 @@ applySolutionToInitialization(SyntacticElementTarget target, Expr *initializer,
         resultTarget.getAsExpr()->forEachChildExpr([&](Expr *expr) -> Expr * {
           if (auto coercionExpr = dyn_cast<UnderlyingToOpaqueExpr>(expr)) {
             auto newSubstitutions =
-                coercionExpr->substitutions.mapReplacementTypesOutOfContext();
+                coercionExpr->substitutions.mapReplacementTypesOutOfEnvironment();
             if (substitutions.empty()) {
               substitutions = newSubstitutions;
             } else {
diff --git a/lib/Sema/MiscDiagnostics.cpp b/lib/Sema/MiscDiagnostics.cpp
@@ -3693,7 +3693,7 @@ class OpaqueUnderlyingTypeChecker : public ASTWalker {
     // If we have one successful candidate, then save it as the underlying
     // substitutions of the opaque decl.
     OpaqueDecl->setUniqueUnderlyingTypeSubstitutions(
-        std::get<1>(candidate).mapReplacementTypesOutOfContext());
+        std::get<1>(candidate).mapReplacementTypesOutOfEnvironment());
   }
 
   // There is no clear winner here since there are candidates within
@@ -3759,14 +3759,14 @@ class OpaqueUnderlyingTypeChecker : public ASTWalker {
       conditionalSubstitutions.push_back(
           OpaqueTypeDecl::ConditionallyAvailableSubstitutions::get(
               Ctx, queries,
-              std::get<1>(candidate).mapReplacementTypesOutOfContext()));
+              std::get<1>(candidate).mapReplacementTypesOutOfEnvironment()));
     }
 
     // Add universally available choice as the last one.
     conditionalSubstitutions.push_back(
         OpaqueTypeDecl::ConditionallyAvailableSubstitutions::get(
             Ctx, {AvailabilityQuery::universallyConstant(true)},
-            universalSubstMap.mapReplacementTypesOutOfContext()));
+            universalSubstMap.mapReplacementTypesOutOfEnvironment()));
 
     OpaqueDecl->setConditionallyAvailableSubstitutions(
         conditionalSubstitutions);
diff --git a/lib/Sema/TypeCheckConcurrency.cpp b/lib/Sema/TypeCheckConcurrency.cpp
@@ -7638,7 +7638,7 @@ ProtocolConformance *swift::deriveImplicitSendableConformance(
           proto, /*allowMissing=*/false);
       if (inheritedConformance) {
         inheritedConformance = inheritedConformance
-            .mapConformanceOutOfContext();
+            .mapConformanceOutOfEnvironment();
         if (inheritedConformance.isConcrete()) {
           return ctx.getInheritedConformance(
               nominal->getDeclaredInterfaceType(),
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -7345,7 +7345,7 @@ void TypeChecker::inferDefaultWitnesses(ProtocolDecl *proto) {
         auto match =
             RequirementMatch(asd, MatchKind::ExactMatch, asdTy, reqEnv);
         match.WitnessSubstitutions = reqEnv.getRequirementToWitnessThunkSubs()
-                                           .mapReplacementTypesOutOfContext();
+                                           .mapReplacementTypesOutOfEnvironment();
         checker.recordWitness(asd, match);
       }
     }
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
@@ -1957,7 +1957,7 @@ void Serializer::writeLocalNormalProtocolConformance(
       // in terms of interface types; hence the hasPrimaryArchetype() check is
       // necessary for correctness, not just as a fast path.
       if (subs.getRecursiveProperties().hasPrimaryArchetype())
-        subs = subs.mapReplacementTypesOutOfContext();
+        subs = subs.mapReplacementTypesOutOfEnvironment();
 
       data.push_back(addSubstitutionMapRef(subs));
       data.push_back(witness.getEnterIsolation().has_value() ? 1 : 0);

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {`
`416`	`416`	`});`
`417`	`417`	`}`
`418`	`418`
`419`		`- SubsMap = SubsMap.mapReplacementTypesOutOfContext();`
	`419`	`+ SubsMap = SubsMap.mapReplacementTypesOutOfEnvironment();`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`// One abstract function in the debug info can only have one set of variables`
`@@ -427,7 +427,7 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {`
`427`	`427`	`!SubsMap.getRecursiveProperties().hasTypeParameter())`
`428`	`428`	`return ParentFunction;`
`429`	`429`
`430`		`- // Note that mapReplacementTypesOutOfContext() can't do anything for`
	`430`	`+ // Note that mapReplacementTypesOutOfEnvironment() can't do anything for`
`431`	`431`	`// opened existentials, and since archetypes can't be mangled, ignore`
`432`	`432`	`// this case for now.`
`433`	`433`	`if (SubsMap.getRecursiveProperties().hasLocalArchetype())`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ ProtocolConformanceRef::subst(InFlightSubstitution &IFS) const {`
`114`	`114`	`return IFS.lookupConformance(origType, proto, /level=/0);`
`115`	`115`	`}`
`116`	`116`
`117`		`-ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() const {`
	`117`	`+ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfEnvironment() const {`
`118`	`118`	`if (isConcrete()) {`
`119`	`119`	`return getConcrete()->subst(`
`120`	`120`	`MapTypeOutOfContext(),`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ SubstitutionMap::lookupConformance(CanType type, ProtocolDecl *proto) const {`
`290`	`290`	`return conformance;`
`291`	`291`	`}`
`292`	`292`
`293`		`-SubstitutionMap SubstitutionMap::mapReplacementTypesOutOfContext() const {`
	`293`	`+SubstitutionMap SubstitutionMap::mapReplacementTypesOutOfEnvironment() const {`
`294`	`294`	`return subst(MapTypeOutOfContext(),`
`295`	`295`	`LookUpConformanceInModule(),`
`296`	`296`	`SubstFlags::PreservePackExpansionLevel \|`
`@@ -419,7 +419,7 @@ OverrideSubsInfo::OverrideSubsInfo(const NominalTypeDecl *baseNominal,`
`419`	`419`	`BaseSubMap = derivedNominalTy->getContextSubstitutionMap(`
`420`	`420`	`baseNominal, genericEnv);`
`421`	`421`
`422`		`- BaseSubMap = BaseSubMap.mapReplacementTypesOutOfContext();`
	`422`	`+ BaseSubMap = BaseSubMap.mapReplacementTypesOutOfEnvironment();`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`if (auto derivedNominalSig = derivedNominal->getGenericSignature())`
Original file line number	Diff line number	Diff line change
`@@ -2509,7 +2509,7 @@ SILParser::parseKeyPathPatternComponent(KeyPathPatternComponent &component,`
`2509`	`2509`	`// Map the substitutions out of the pattern context so that they`
`2510`	`2510`	`// use interface types.`
`2511`	`2511`	`externalSubs =`
`2512`		`- externalSubs.mapReplacementTypesOutOfContext().getCanonical();`
	`2512`	`+ externalSubs.mapReplacementTypesOutOfEnvironment().getCanonical();`
`2513`	`2513`	`}`
`2514`	`2514`
`2515`	`2515`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -4588,7 +4588,7 @@ AssociatedConformanceRequest::evaluate(Evaluator &eval,`
`4588`	`4588`	`substTy = conformance->getDeclContext()->mapTypeIntoEnvironment(substTy);`
`4589`	`4589`
`4590`	`4590`	`return lookupConformance(substTy, reqProto, /allowMissing=/true)`
`4591`		`- .mapConformanceOutOfContext();`
	`4591`	`+ .mapConformanceOutOfEnvironment();`
`4592`	`4592`	`}`
`4593`	`4593`
`4594`	`4594`	`TinyPtrVector<AssociatedTypeDecl *>`