AST: Rename mapTypeIntoContext() => mapTypeIntoEnvironment(), mapTypeOutOfContext() => mapTypeOutOfEnvironment() [6.3]

SwiftCompilerSources/Sources/AST/GenericSignature.swift

@@ -30,8 +30,8 @@ public struct GenericSignature: CustomStringConvertible, NoReflectionChildren {
     TypeArray(bridged: bridged.getGenericParams())
   }
 
-  public func mapTypeIntoContext(_ type: Type) -> Type {
-    Type(bridged: bridged.mapTypeIntoContext(type.bridged))
+  public func mapTypeIntoEnvironment(_ type: Type) -> Type {
+    Type(bridged: bridged.mapTypeIntoEnvironment(type.bridged))
   }
 
   public var isEmpty: Bool { bridged.impl == nil }

SwiftCompilerSources/Sources/SIL/Function.swift

@@ -86,8 +86,8 @@ final public class Function : CustomStringConvertible, HasShortDescription, Hash
     SubstitutionMap(bridged: bridged.getForwardingSubstitutionMap())
   }
 
-  public func mapTypeIntoContext(_ type: AST.`Type`) -> AST.`Type` {
-    return AST.`Type`(bridged: bridged.mapTypeIntoContext(type.bridged))
+  public func mapTypeIntoEnvironment(_ type: AST.`Type`) -> AST.`Type` {
+    return AST.`Type`(bridged: bridged.mapTypeIntoEnvironment(type.bridged))
   }
 
   /// Returns true if the function is a definition and not only an external declaration.

SwiftCompilerSources/Sources/SIL/Type.swift

@@ -144,7 +144,7 @@ public struct Type : TypeProperties, CustomStringConvertible, NoReflectionChildr
   public var hasValidSignatureForEmbedded: Bool {
     let genericSignature = invocationGenericSignatureOfFunction
     for genParam in genericSignature.genericParameters {
-      let mappedParam = genericSignature.mapTypeIntoContext(genParam)
+      let mappedParam = genericSignature.mapTypeIntoEnvironment(genParam)
       if mappedParam.isArchetype && !mappedParam.archetypeRequiresClass {
         return false
       }

include/swift/AST/ASTBridging.h

@@ -3074,7 +3074,7 @@ struct BridgedGenericSignature {
   BRIDGED_INLINE swift::GenericSignature unbridged() const;
   BridgedOwnedString getDebugDescription() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTTypeArray getGenericParams() const;
-  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTType mapTypeIntoContext(BridgedASTType type) const;
+  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTType mapTypeIntoEnvironment(BridgedASTType type) const;
 };
 
 struct BridgedFingerprint {

include/swift/AST/ASTBridgingImpl.h

@@ -869,8 +869,8 @@ BridgedASTTypeArray BridgedGenericSignature::getGenericParams() const {
   return {unbridged().getGenericParams()};
 }
 
-BridgedASTType BridgedGenericSignature::mapTypeIntoContext(BridgedASTType type) const {
-  return {unbridged().getGenericEnvironment()->mapTypeIntoContext(type.unbridged()).getPointer()};
+BridgedASTType BridgedGenericSignature::mapTypeIntoEnvironment(BridgedASTType type) const {
+  return {unbridged().getGenericEnvironment()->mapTypeIntoEnvironment(type.unbridged()).getPointer()};
 }
 
 //===----------------------------------------------------------------------===//

include/swift/AST/AnyFunctionRef.h

@@ -96,7 +96,7 @@ class AnyFunctionRef {
   Type getBodyResultType() const {
     if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>()) {
       if (auto *FD = dyn_cast<FuncDecl>(AFD))
-        return FD->mapTypeIntoContext(FD->getResultInterfaceType());
+        return FD->mapTypeIntoEnvironment(FD->getResultInterfaceType());
       return TupleType::getEmpty(AFD->getASTContext());
     }
     return cast<AbstractClosureExpr *>(TheFunction)->getResultType();
@@ -308,7 +308,7 @@ class AnyFunctionRef {
           auto valueTy = AD->getStorage()->getValueInterfaceType()
                                          ->getReferenceStorageReferent();
           if (mapIntoContext)
-            valueTy = AD->mapTypeIntoContext(valueTy);
+            valueTy = AD->mapTypeIntoEnvironment(valueTy);
           YieldTypeFlags flags(isYieldingMutableAccessor(AD->getAccessorKind())
                                    ? ParamSpecifier::InOut
                                    : ParamSpecifier::LegacyShared);

include/swift/AST/DeclContext.h

@@ -441,7 +441,7 @@ class alignas(1 << DeclContextAlignInBits) DeclContext
   GenericEnvironment *getGenericEnvironmentOfContext() const;
 
   /// Map an interface type to a contextual type within this context.
-  Type mapTypeIntoContext(Type type) const;
+  Type mapTypeIntoEnvironment(Type type) const;
 
   /// Returns this or the first local parent context, or nullptr if it is not
   /// contained in one.

include/swift/AST/GenericEnvironment.h

@@ -75,10 +75,10 @@ struct ElementEnvironmentData {
 /// Describes the mapping between archetypes and interface types for the
 /// generic parameters of a DeclContext.
 ///
-/// The most frequently used method here is mapTypeIntoContext(), which
+/// The most frequently used method here is mapTypeIntoEnvironment(), which
 /// maps an interface type to a type written in terms of the generic
 /// environment's archetypes; to go in the other direction, use
-/// TypeBase::mapTypeOutOfContext().
+/// TypeBase::mapTypeOutOfEnvironment().
 ///
 class alignas(1 << DeclAlignInBits) GenericEnvironment final
     : private llvm::TrailingObjects<
@@ -279,14 +279,14 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
   Type maybeApplyOuterContextSubstitutions(Type type) const;
 
   /// Map an interface type to a contextual type.
-  static Type mapTypeIntoContext(GenericEnvironment *genericEnv,
+  static Type mapTypeIntoEnvironment(GenericEnvironment *genericEnv,
                                  Type type);
 
   /// Map an interface type to a contextual type.
-  Type mapTypeIntoContext(Type type) const;
+  Type mapTypeIntoEnvironment(Type type) const;
 
   /// Map a generic parameter type to a contextual type.
-  Type mapTypeIntoContext(GenericTypeParamType *type) const;
+  Type mapTypeIntoEnvironment(GenericTypeParamType *type) const;
 
   /// Map a type parameter type to a contextual type.
   Type getOrCreateArchetypeFromInterfaceType(Type depType);
@@ -327,7 +327,7 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
   ///
   /// This operation will also reabstract dependent types according to the
   /// abstraction level of their associated type requirements.
-  SILType mapTypeIntoContext(SILModule &M, SILType type) const;
+  SILType mapTypeIntoEnvironment(SILModule &M, SILType type) const;
 
   /// Returns a substitution map that sends every generic parameter to its
   /// corresponding archetype in this generic environment.

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.

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.

include/swift/AST/TypeTransform.h

@@ -184,7 +184,7 @@ case TypeKind::Id:
 
       auto *newEnv = GenericEnvironment::forOpenedExistential(
           genericSig, existentialTy, newSubMap, uuid);
-      return newEnv->mapTypeIntoContext(local->getInterfaceType());
+      return newEnv->mapTypeIntoEnvironment(local->getInterfaceType());
     }
 
     case TypeKind::ElementArchetype: {

include/swift/AST/Types.h

@@ -842,7 +842,7 @@ class alignas(1 << TypeAlignInBits) TypeBase
   Type addCurriedSelfType(const DeclContext *dc);
 
   /// Map a contextual type to an interface type.
-  Type mapTypeOutOfContext();
+  Type mapTypeOutOfEnvironment();
 
   /// Compute and return the set of type variables that occur within this
   /// type.
@@ -4774,8 +4774,8 @@ class SILParameterInfo {
     return getWithInterfaceType(fn(getInterfaceType()));
   }
 
-  SILParameterInfo mapTypeOutOfContext() const {
-    return getWithInterfaceType(getInterfaceType()->mapTypeOutOfContext()
+  SILParameterInfo mapTypeOutOfEnvironment() const {
+    return getWithInterfaceType(getInterfaceType()->mapTypeOutOfEnvironment()
                                                   ->getCanonicalType());
   }
 
@@ -5047,8 +5047,8 @@ class SILResultInfo {
     return getWithInterfaceType(fn(getInterfaceType()));
   }
 
-  SILResultInfo mapTypeOutOfContext() const {
-    return getWithInterfaceType(getInterfaceType()->mapTypeOutOfContext()
+  SILResultInfo mapTypeOutOfEnvironment() const {
+    return getWithInterfaceType(getInterfaceType()->mapTypeOutOfEnvironment()
                                                   ->getCanonicalType());
   }
 
@@ -5114,8 +5114,8 @@ class SILYieldInfo : public SILParameterInfo {
     return getWithInterfaceType(fn(getInterfaceType()));
   }
 
-  SILYieldInfo mapTypeOutOfContext() const {
-    return getWithInterfaceType(getInterfaceType()->mapTypeOutOfContext()
+  SILYieldInfo mapTypeOutOfEnvironment() const {
+    return getWithInterfaceType(getInterfaceType()->mapTypeOutOfEnvironment()
                                                   ->getCanonicalType());
   }
 

include/swift/SIL/SILBridging.h

@@ -536,7 +536,7 @@ struct BridgedFunction {
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedCanType getLoweredFunctionTypeInContext() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedGenericSignature getGenericSignature() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedSubstitutionMap getForwardingSubstitutionMap() const;
-  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTType mapTypeIntoContext(BridgedASTType ty) const;
+  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTType mapTypeIntoEnvironment(BridgedASTType ty) const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE OptionalBridgedBasicBlock getFirstBlock() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE OptionalBridgedBasicBlock getLastBlock() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedDeclRef getDeclRef() const;

include/swift/SIL/SILBridgingImpl.h

@@ -781,8 +781,8 @@ BridgedSubstitutionMap BridgedFunction::getForwardingSubstitutionMap() const {
   return {getFunction()->getForwardingSubstitutionMap()};
 }
 
-BridgedASTType BridgedFunction::mapTypeIntoContext(BridgedASTType ty) const {
-  return {getFunction()->mapTypeIntoContext(ty.unbridged()).getPointer()};
+BridgedASTType BridgedFunction::mapTypeIntoEnvironment(BridgedASTType ty) const {
+  return {getFunction()->mapTypeIntoEnvironment(ty.unbridged()).getPointer()};
 }
 
 OptionalBridgedBasicBlock BridgedFunction::getFirstBlock() const {

include/swift/SIL/SILCloner.h

@@ -71,7 +71,7 @@ struct SubstitutionMapWithLocalArchetypes {
       auto *newEnv = found->second;
 
       auto interfaceTy = local->getInterfaceType();
-      return newEnv->mapTypeIntoContext(interfaceTy);
+      return newEnv->mapTypeIntoEnvironment(interfaceTy);
     }
 
     if (SubsMap)
@@ -89,7 +89,7 @@ struct SubstitutionMapWithLocalArchetypes {
     if (SubsMap) {
       if (origType->is<PrimaryArchetypeType>() ||
           origType->is<PackArchetypeType>()) {
-        origType = origType->mapTypeOutOfContext();
+        origType = origType->mapTypeOutOfEnvironment();
       }
 
       return SubsMap->lookupConformance(

include/swift/SIL/SILFunction.h

@@ -1357,12 +1357,12 @@ class SILFunction
   /// Map the given type, which is based on an interface SILFunctionType and may
   /// therefore be dependent, to a type based on the context archetypes of this
   /// SILFunction.
-  Type mapTypeIntoContext(Type type) const;
+  Type mapTypeIntoEnvironment(Type type) const;
 
   /// Map the given type, which is based on an interface SILFunctionType and may
   /// therefore be dependent, to a type based on the context archetypes of this
   /// SILFunction.
-  SILType mapTypeIntoContext(SILType type) const;
+  SILType mapTypeIntoEnvironment(SILType type) const;
 
   /// Converts the given function definition to a declaration.
   void convertToDeclaration() {

include/swift/SIL/SILType.h

@@ -872,12 +872,12 @@ class SILType {
   SILType removingAnyMoveOnlyWrapping(const SILFunction *fn);
 
   /// Returns a SILType with any archetypes mapped out of context.
-  SILType mapTypeOutOfContext() const;
+  SILType mapTypeOutOfEnvironment() const;
 
   /// Given a lowered type (but without any particular value category),
   /// map it out of its current context.  Equivalent to
-  /// SILType::getPrimitiveObjectType(type).mapTypeOutOfContext().getASTType().
-  static CanType mapTypeOutOfContext(CanType type);
+  /// SILType::getPrimitiveObjectType(type).mapTypeOutOfEnvironment().getASTType().
+  static CanType mapTypeOutOfEnvironment(CanType type);
 
   /// Given two SIL types which are representations of the same type,
   /// check whether they have an abstraction difference.

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())

include/swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h

@@ -136,7 +136,7 @@ class DifferentiableActivityInfo {
     // Remap archetypes in the derivative generic signature, if it exists.
     if (type->hasArchetype()) {
       type = derivativeGenericSignature.getReducedType(
-          type->mapTypeOutOfContext());
+          type->mapTypeOutOfEnvironment());
     }
     // Look up conformance in the current module.
     auto lookupConformance = LookUpConformanceInModule();

include/swift/SILOptimizer/Differentiation/Common.h

@@ -274,21 +274,21 @@ inline void createEntryArguments(SILFunction *f) {
   for (auto indResTy :
        conv.getIndirectSILResultTypes(f->getTypeExpansionContext())) {
     if (indResTy.hasArchetype())
-      indResTy = indResTy.mapTypeOutOfContext();
-    createFunctionArgument(f->mapTypeIntoContext(indResTy).getAddressType());
+      indResTy = indResTy.mapTypeOutOfEnvironment();
+    createFunctionArgument(f->mapTypeIntoEnvironment(indResTy).getAddressType());
   }
   if (auto indErrorResTy =
           conv.getIndirectErrorResultType(f->getTypeExpansionContext())) {
     if (indErrorResTy.hasArchetype())
-      indErrorResTy = indErrorResTy.mapTypeOutOfContext();
+      indErrorResTy = indErrorResTy.mapTypeOutOfEnvironment();
     createFunctionArgument(
-        f->mapTypeIntoContext(indErrorResTy).getAddressType());
+        f->mapTypeIntoEnvironment(indErrorResTy).getAddressType());
   }
 
   for (auto paramTy : conv.getParameterSILTypes(f->getTypeExpansionContext())) {
     if (paramTy.hasArchetype())
-      paramTy = paramTy.mapTypeOutOfContext();
-    createFunctionArgument(f->mapTypeIntoContext(paramTy));
+      paramTy = paramTy.mapTypeOutOfEnvironment();
+    createFunctionArgument(f->mapTypeIntoEnvironment(paramTy));
   }
 }
 

include/swift/SILOptimizer/Utils/Generics.h

@@ -342,7 +342,7 @@ class ReabstractionInfo {
   SILFunction *getNonSpecializedFunction() const { return Callee; }
 
   /// Map SIL type into a context of the specialized function.
-  SILType mapTypeIntoContext(SILType type) const;
+  SILType mapTypeIntoEnvironment(SILType type) const;
 
   SILModule &getModule() const { return *M; }
 

include/swift/Sema/ConstraintSystem.h

@@ -951,7 +951,7 @@ class FunctionArgApplyInfo {
     if (!interfaceFnTy) {
       // If the interface type isn't a function, then just return the resolved
       // parameter type.
-      return getParamType(lookThroughAutoclosure)->mapTypeOutOfContext();
+      return getParamType(lookThroughAutoclosure)->mapTypeOutOfEnvironment();
     }
     return getParamTypeImpl(interfaceFnTy, lookThroughAutoclosure);
   }

lib/AST/ASTContext.cpp

@@ -5812,7 +5812,7 @@ CanExistentialArchetypeType ExistentialArchetypeType::get(CanType existential) {
       existentialSig.Generalization, UUID::fromTime());
 
   return cast<ExistentialArchetypeType>(
-    genericEnv->mapTypeIntoContext(existentialSig.SelfType)
+    genericEnv->mapTypeIntoEnvironment(existentialSig.SelfType)
       ->getCanonicalType());
 }
 

lib/AST/ASTDumper.cpp

@@ -261,7 +261,7 @@ std::string typeUSR(Type type) {
     return "";
 
   if (type->hasArchetype()) {
-    type = type->mapTypeOutOfContext();
+    type = type->mapTypeOutOfEnvironment();
   }
   if (type->hasLocalArchetype()) {
     type = replaceLocalArchetypesWithExistentials(type);
@@ -6821,7 +6821,7 @@ void GenericEnvironment::dump(raw_ostream &os) const {
   os << "Generic environment:\n";
   for (auto gp : getGenericParams()) {
     gp->dump(os);
-    mapTypeIntoContext(gp)->dump(os);
+    mapTypeIntoEnvironment(gp)->dump(os);
   }
   os << "Generic parameters:\n";
   for (auto paramTy : getGenericParams())