AST: ParameterList::getInterfaceType() now takes an ASTContext instead of a DeclContext

We no longer have to mapTypeOutOfContext() here, so the dc
isn't needed.

Author: slavapestov

include/swift/AST/ParameterList.h

@@ -135,21 +135,21 @@ class alignas(ParamDecl *) ParameterList final :
   /// the ParamDecls, so they can be reparented into a new DeclContext.
   ParameterList *clone(const ASTContext &C,
                        OptionSet<CloneFlags> options = None) const;
-  
-  /// Return a TupleType or ParenType for this parameter list.  This returns a
-  /// null type if one of the ParamDecls does not have a type set for it yet.
+
+  /// Return a TupleType or ParenType for this parameter list, written in terms
+  /// of contextual archetypes.
   Type getType(const ASTContext &C) const;
-  
-  /// Return a TupleType or ParenType for this parameter list written in terms
+
+  /// Return a TupleType or ParenType for this parameter list, written in terms
   /// of interface types.
-  Type getInterfaceType(DeclContext *DC) const;
+  Type getInterfaceType(const ASTContext &C) const;
 
   /// Return the full function type for a set of curried parameter lists that
   /// returns the specified result type written in terms of interface types.
   static Type getFullInterfaceType(Type resultType, ArrayRef<ParameterList*> PL,
-                                   DeclContext *DC);
-  
-  
+                                   const ASTContext &C);
+
+
   /// Return the full source range of this parameter.
   SourceRange getSourceRange() const;
   SourceLoc getStartLoc() const { return getSourceRange().Start; }

lib/AST/Parameter.cpp

@@ -109,17 +109,15 @@ ParameterList *ParameterList::clone(const ASTContext &C,
   return create(C, params);
 }
 
-/// Return a TupleType or ParenType for this parameter list.  This returns a
-/// null type if one of the ParamDecls does not have a type set for it yet.
+/// Return a TupleType or ParenType for this parameter list, written in terms
+/// of contextual archetypes.
 Type ParameterList::getType(const ASTContext &C) const {
   if (size() == 0)
     return TupleType::getEmpty(C);
 
   SmallVector<TupleTypeElt, 8> argumentInfo;
 
   for (auto P : *this) {
-    if (!P->hasType()) return Type();
-
     argumentInfo.emplace_back(
         P->getType(), P->getArgumentName(),
         ParameterTypeFlags::fromParameterType(P->getType(), P->isVariadic()));
@@ -128,11 +126,9 @@ Type ParameterList::getType(const ASTContext &C) const {
   return TupleType::get(argumentInfo, C);
 }
 
-/// Hack to deal with the fact that Sema/CodeSynthesis.cpp creates ParamDecls
-/// containing contextual types.
-Type ParameterList::getInterfaceType(DeclContext *DC) const {
-  auto &C = DC->getASTContext();
-
+/// Return a TupleType or ParenType for this parameter list, written in terms
+/// of interface types.
+Type ParameterList::getInterfaceType(const ASTContext &C) const {
   if (size() == 0)
     return TupleType::getEmpty(C);
 
@@ -157,10 +153,10 @@ Type ParameterList::getInterfaceType(DeclContext *DC) const {
 ///
 Type ParameterList::getFullInterfaceType(Type resultType,
                                          ArrayRef<ParameterList*> PLL,
-                                         DeclContext *DC) {
+                                         const ASTContext &C) {
   auto result = resultType;
   for (auto PL : reversed(PLL)) {
-    auto paramType = PL->getInterfaceType(DC);
+    auto paramType = PL->getInterfaceType(C);
     result = FunctionType::get(paramType, result);
   }
   return result;

lib/ClangImporter/ImportDecl.cpp

@@ -440,7 +440,7 @@ static FuncDecl *makeEnumRawValueGetter(ClangImporter::Implementation &Impl,
   getterDecl->setImplicit();
 
   auto type = ParameterList::getFullInterfaceType(enumDecl->getRawType(),
-                                                  params, enumDecl);
+                                                  params, C);
 
   getterDecl->setInterfaceType(type);
 
@@ -502,8 +502,7 @@ static FuncDecl *makeNewtypeBridgedRawValueGetter(
                      TypeLoc::withoutLoc(computedType), structDecl);
   getterDecl->setImplicit();
 
-  auto type = ParameterList::getFullInterfaceType(computedType, params,
-                                                  structDecl);
+  auto type = ParameterList::getFullInterfaceType(computedType, params, C);
 
   getterDecl->setInterfaceType(type);
 
@@ -552,8 +551,7 @@ static FuncDecl *makeFieldGetterDecl(ClangImporter::Implementation &Impl,
                      TypeLoc::withoutLoc(getterType), importedDecl, clangNode);
   getterDecl->setAccessibility(Accessibility::Public);
 
-  auto type = ParameterList::getFullInterfaceType(getterType, params,
-                                                  importedDecl);
+  auto type = ParameterList::getFullInterfaceType(getterType, params, C);
   getterDecl->setInterfaceType(type);
 
 
@@ -588,8 +586,7 @@ static FuncDecl *makeFieldSetterDecl(ClangImporter::Implementation &Impl,
                      /*GenericParams=*/nullptr, params,
                      TypeLoc::withoutLoc(voidTy), importedDecl, clangNode);
 
-  auto type = ParameterList::getFullInterfaceType(voidTy, params,
-                                                  importedDecl);
+  auto type = ParameterList::getFullInterfaceType(voidTy, params, C);
   setterDecl->setInterfaceType(type);
 
   setterDecl->setAccessibility(Accessibility::Public);
@@ -1262,7 +1259,7 @@ static FuncDecl *buildSubscriptGetterDecl(ClangImporter::Implementation &Impl,
 
   // Form the type of the getter.
   auto getterType =
-      ParameterList::getFullInterfaceType(elementTy, getterArgs, dc);
+      ParameterList::getFullInterfaceType(elementTy, getterArgs, C);
 
   auto interfaceType =
       getGenericMethodType(dc, getterType->castTo<AnyFunctionType>());
@@ -1322,7 +1319,7 @@ static FuncDecl *buildSubscriptSetterDecl(ClangImporter::Implementation &Impl,
 
   // Form the type of the setter.
   Type setterType = ParameterList::getFullInterfaceType(TupleType::getEmpty(C),
-                                                        setterArgs, dc);
+                                                        setterArgs, C);
 
   auto interfaceType =
       getGenericMethodType(dc, setterType->castTo<AnyFunctionType>());
@@ -1486,8 +1483,7 @@ static bool addErrorDomain(NominalTypeDecl *swiftDecl,
       ParameterList::createWithoutLoc(
           ParamDecl::createSelf(SourceLoc(), swiftDecl, isStatic)),
       ParameterList::createEmpty(C)};
-  auto toStringTy = ParameterList::getFullInterfaceType(stringTy, params,
-                                                        swiftDecl);
+  auto toStringTy = ParameterList::getFullInterfaceType(stringTy, params, C);
 
   FuncDecl *getterDecl =
     FuncDecl::create(C, /*StaticLoc=*/SourceLoc(), StaticSpellingKind::None,
@@ -4815,7 +4811,7 @@ Decl *SwiftDeclConverter::importGlobalAsMethod(const clang::FunctionDecl *decl,
   auto swiftResultTy = Impl.importFunctionReturnType(
       dc, decl, decl->getReturnType(), allowNSUIntegerAsInt);
   auto fnType =
-      ParameterList::getFullInterfaceType(swiftResultTy, bodyParams, dc);
+      ParameterList::getFullInterfaceType(swiftResultTy, bodyParams, C);
 
   auto loc = Impl.importSourceLoc(decl->getLocation());
   auto nameLoc = Impl.importSourceLoc(decl->getLocation());
@@ -7048,7 +7044,7 @@ ClangImporter::Implementation::createConstant(Identifier name, DeclContext *dc,
   getterArgs.push_back(ParameterList::createEmpty(C));
 
   // Form the type of the getter.
-  auto getterType = ParameterList::getFullInterfaceType(type, getterArgs, dc);
+  auto getterType = ParameterList::getFullInterfaceType(type, getterArgs, C);
 
   // Create the getter function declaration.
   auto func =

lib/ClangImporter/ImportType.cpp

@@ -2117,7 +2117,7 @@ Type ClangImporter::Implementation::importMethodType(
 
   // Form the function type.
   return FunctionType::get(
-      (*bodyParams)->getInterfaceType(const_cast<DeclContext*>(dc)),
+      (*bodyParams)->getInterfaceType(SwiftContext),
       swiftResultTy, extInfo);
 }
 

lib/Sema/TypeCheckDecl.cpp

@@ -3742,7 +3742,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       if (SD->hasInterfaceType())
         return;
 
-      auto indicesIfaceTy = SD->getIndices()->getInterfaceType(dc);
+      auto indicesIfaceTy = SD->getIndices()->getInterfaceType(TC.Context);
 
       auto elementTy = SD->getElementTypeLoc().getType();
       auto elementIfaceTy = dc->mapTypeOutOfContext(elementTy);
@@ -4337,17 +4337,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       return true;
     }
 
-    auto paramLists = FD->getParameterLists();
-
-    for (unsigned i = 0, e = paramLists.size(); i != e; ++i) {
-      Type argTy = paramLists[e - i - 1]->getType(TC.Context);
-      if (!argTy) {
-        FD->setInterfaceType(ErrorType::get(TC.Context));
-        FD->setInvalid();
-        return true;
-      }
-    }
-
     return false;
   }
 

lib/Sema/TypeCheckGeneric.cpp

@@ -672,7 +672,7 @@ void TypeChecker::configureInterfaceType(AbstractFunctionDecl *func,
         initArgTy = func->computeInterfaceSelfType(/*isInitializingCtor=*/true);
       }
     } else {
-      argTy = paramLists[e - i - 1]->getInterfaceType(func->getDeclContext());
+      argTy = paramLists[e - i - 1]->getInterfaceType(Context);
 
       if (initFuncTy)
         initArgTy = argTy;

lib/Sema/TypeCheckREPL.cpp

@@ -245,7 +245,7 @@ void REPLChecker::generatePrintOfExpression(StringRef NameStr, Expr *E) {
                                 TypeLoc(), discriminator, newTopLevel);
 
   CE->setType(ParameterList::getFullInterfaceType(
-      TupleType::getEmpty(Context), params, newTopLevel));
+      TupleType::getEmpty(Context), params, Context));
 
   // Convert the pattern to a string we can print.
   llvm::SmallString<16> PrefixString;