Merge pull request #85459 from slavapestov/rename-generic-environment-operations

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

Author: slavapestov

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.