Merge pull request swiftlang#12959 from slavapestov/map-type-out-of-context-cleanup

Move mapTypeOutOfContext() from GenericEnvironment to TypeBase

Author: slavapestov

include/swift/AST/DeclContext.h

@@ -323,9 +323,6 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
   /// Map an interface type to a contextual type within this context.
   Type mapTypeIntoContext(Type type) const;
 
-  /// Map a type within this context to an interface type.
-  Type mapTypeOutOfContext(Type type) const;
-
   /// Returns this or the first local parent context, or nullptr if it is not
   /// contained in one.
   DeclContext *getLocalContext();

include/swift/AST/GenericEnvironment.h

@@ -37,6 +37,12 @@ class SILType;
 
 /// Describes the mapping between archetypes and interface types for the
 /// generic parameters of a DeclContext.
+///
+/// The most frequently used method here is mapTypeIntoContext(), 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().
+///
 class alignas(1 << DeclAlignInBits) GenericEnvironment final
         : private llvm::TrailingObjects<GenericEnvironment, Type> {
   GenericSignature *Signature = nullptr;
@@ -126,13 +132,6 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
   static Type mapTypeIntoContext(GenericEnvironment *genericEnv,
                                  Type type);
 
-  /// Map a contextual type to an interface type.
-  static Type mapTypeOutOfContext(GenericEnvironment *genericEnv,
-                                  Type type);
-
-  /// Map a contextual type to an interface type.
-  Type mapTypeOutOfContext(Type type) const;
-
   /// Map an interface type to a contextual type.
   Type mapTypeIntoContext(Type type) const;
 

include/swift/AST/Types.h

@@ -524,6 +524,9 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   /// underlying type.
   Type eraseDynamicSelfType();
 
+  /// Map a contextual type to an interface type.
+  Type mapTypeOutOfContext();
+
   /// \brief Compute and return the set of type variables that occur within this
   /// type.
   ///

include/swift/SIL/SILFunction.h

@@ -648,10 +648,6 @@ class SILFunction
   /// SILFunction.
   SILType mapTypeIntoContext(SILType type) const;
 
-  /// Map the given type, which is based on a contextual SILFunctionType and may
-  /// therefore contain context archetypes, to an interface type.
-  Type mapTypeOutOfContext(Type type) const;
-
   /// Converts the given function definition to a declaration.
   void convertToDeclaration();
 

lib/AST/ASTMangler.cpp

@@ -1780,7 +1780,7 @@ void ASTMangler::appendClosureComponents(Type Ty, unsigned discriminator,
   if (!Ty)
     Ty = ErrorType::get(localContext->getASTContext());
 
-  Ty = parentContext->mapTypeOutOfContext(Ty);
+  Ty = Ty->mapTypeOutOfContext();
   appendType(Ty->getCanonicalType());
   appendOperator(isImplicit ? "fu" : "fU", Index(discriminator));
 }
@@ -1978,9 +1978,7 @@ void ASTMangler::appendProtocolConformance(const ProtocolConformance *conformanc
     appendProtocolName(conformance->getProtocol());
     appendIdentifier(behaviorStorage->getBaseName().getIdentifier().str());
   } else {
-    auto conformanceDC = conformance->getDeclContext();
-    auto conformingType =
-      conformanceDC->mapTypeOutOfContext(conformance->getType());
+    auto conformingType = conformance->getType()->mapTypeOutOfContext();
     appendType(conformingType->getCanonicalType());
     appendProtocolName(conformance->getProtocol());
     appendModule(conformance->getDeclContext()->getParentModule());

lib/AST/ASTPrinter.cpp

@@ -487,7 +487,7 @@ class PrintAST : public ASTVisitor<PrintAST> {
       if (T->hasArchetype()) {
         // Get the interface type, since TypeLocs still have
         // contextual types in them.
-        T = Current->getInnermostDeclContext()->mapTypeOutOfContext(T);
+        T = T->mapTypeOutOfContext();
       }
 
       auto *M = Current->getDeclContext()->getParentModule();

lib/AST/Decl.cpp

@@ -2503,7 +2503,7 @@ void TypeAliasDecl::setUnderlyingType(Type underlying) {
   // lldb creates global typealiases containing archetypes
   // sometimes...
   if (underlying->hasArchetype() && isGenericContext())
-    underlying = mapTypeOutOfContext(underlying);
+    underlying = underlying->mapTypeOutOfContext();
   UnderlyingTy.setType(underlying);
 
   // FIXME -- if we already have an interface type, we're changing the
@@ -5185,7 +5185,7 @@ bool EnumElementDecl::computeType() {
 
   // The type of the enum element is either (T) -> T or (T) -> ArgType -> T.
   if (auto inputTy = getArgumentTypeLoc().getType()) {
-    resultTy = FunctionType::get(ED->mapTypeOutOfContext(inputTy), resultTy);
+    resultTy = FunctionType::get(inputTy->mapTypeOutOfContext(), resultTy);
   }
 
   if (auto *genericSig = ED->getGenericSignatureOfContext())

lib/AST/DeclContext.cpp

@@ -305,11 +305,6 @@ Type DeclContext::mapTypeIntoContext(Type type) const {
       getGenericEnvironmentOfContext(), type);
 }
 
-Type DeclContext::mapTypeOutOfContext(Type type) const {
-  return GenericEnvironment::mapTypeOutOfContext(
-      getGenericEnvironmentOfContext(), type);
-}
-
 DeclContext *DeclContext::getLocalContext() {
   if (isLocalContext())
     return this;

lib/AST/GenericEnvironment.cpp

@@ -120,25 +120,13 @@ Type GenericEnvironment::mapTypeIntoContext(GenericEnvironment *env,
   return env->mapTypeIntoContext(type);
 }
 
-Type
-GenericEnvironment::mapTypeOutOfContext(GenericEnvironment *env,
-                                        Type type) {
-  assert(!type->hasTypeParameter() && "already have an interface type");
-
-  if (!env)
-    return type.substDependentTypesWithErrorTypes();
-
-  return env->mapTypeOutOfContext(type);
-}
-
-Type GenericEnvironment::mapTypeOutOfContext(Type type) const {
-  type = type.subst([&](SubstitutableType *t) -> Type {
-                      return cast<ArchetypeType>(t)->getInterfaceType();
-                    },
-                    MakeAbstractConformanceForGenericType(),
-                    SubstFlags::AllowLoweredTypes);
-  assert(!type->hasArchetype() && "not fully substituted");
-  return type;
+Type TypeBase::mapTypeOutOfContext() {
+  assert(!hasTypeParameter() && "already have an interface type");
+  return Type(this).subst([&](SubstitutableType *t) -> Type {
+      return cast<ArchetypeType>(t)->getInterfaceType();
+    },
+    MakeAbstractConformanceForGenericType(),
+    SubstFlags::AllowLoweredTypes);
 }
 
 Type GenericEnvironment::QueryInterfaceTypeSubstitutions::operator()(

lib/ClangImporter/ImportType.cpp

@@ -2114,7 +2114,7 @@ Type ClangImporter::Implementation::importMethodType(
                                            bodyName,
                                            swiftParamTy,
                                            ImportedHeaderUnit);
-    paramInfo->setInterfaceType(dc->mapTypeOutOfContext(swiftParamTy));
+    paramInfo->setInterfaceType(swiftParamTy->mapTypeOutOfContext());
 
     // Determine whether we have a default argument.
     if (kind == SpecialMethodKind::Regular ||
@@ -2178,7 +2178,7 @@ Type ClangImporter::Implementation::importMethodType(
 
   // Form the function type.
   return FunctionType::get((*bodyParams)->getInterfaceType(SwiftContext),
-                           dc->mapTypeOutOfContext(swiftResultTy), extInfo);
+                           swiftResultTy->mapTypeOutOfContext(), extInfo);
 }
 
 Type ClangImporter::Implementation::importAccessorMethodType(
@@ -2218,7 +2218,7 @@ Type ClangImporter::Implementation::importAccessorMethodType(
   Type resultTy;
   if (isGetter) {
     *params = ParameterList::createEmpty(SwiftContext);
-    resultTy = dc->mapTypeOutOfContext(propertyTy);
+    resultTy = propertyTy->mapTypeOutOfContext();
   } else {
     const clang::ParmVarDecl *param = clangDecl->parameters().front();
     ImportedName fullBodyName = importFullName(param, CurrentVersion);
@@ -2233,7 +2233,7 @@ Type ClangImporter::Implementation::importAccessorMethodType(
                                            argLabel, nameLoc, bodyName,
                                            propertyTy,
                                            /*dummy DC*/ImportedHeaderUnit);
-    paramInfo->setInterfaceType(dc->mapTypeOutOfContext(propertyTy));
+    paramInfo->setInterfaceType(propertyTy->mapTypeOutOfContext());
 
     *params = ParameterList::create(SwiftContext, paramInfo);
     resultTy = SwiftContext.getVoidDecl()->getDeclaredInterfaceType();