Merge pull request swiftlang#28948 from CodaFi/wysiwyg-interface-type

Wysiwyg interface type

Author: CodaFi

lib/AST/Decl.cpp

@@ -2940,6 +2940,7 @@ Type ValueDecl::getInterfaceType() const {
 }
 
 void ValueDecl::setInterfaceType(Type type) {
+  assert(!type.isNull() && "Resetting the interface type to null is forbidden");
   getASTContext().evaluator.cacheOutput(InterfaceTypeRequest{this},
                                         std::move(type));
 }

lib/Sema/CSDiag.cpp

@@ -378,7 +378,6 @@ namespace {
     llvm::DenseMap<Expr*, Type> ExprTypes;
     llvm::DenseMap<TypeLoc*, Type> TypeLocTypes;
     llvm::DenseMap<Pattern*, Type> PatternTypes;
-    llvm::DenseMap<ParamDecl*, Type> ParamDeclInterfaceTypes;
     ExprTypeSaverAndEraser(const ExprTypeSaverAndEraser&) = delete;
     void operator=(const ExprTypeSaverAndEraser&) = delete;
   public:
@@ -417,17 +416,6 @@ namespace {
           if (isa<LiteralExpr>(expr) && !isa<InterpolatedStringLiteralExpr>(expr) &&
               !(expr->getType() && expr->getType()->hasError()))
             return { false, expr };
-
-          // If a ClosureExpr's parameter list has types on the decls, then
-          // remove them so that they'll get regenerated from the
-          // associated TypeLocs or resynthesized as fresh typevars.
-          if (auto *CE = dyn_cast<ClosureExpr>(expr))
-            for (auto P : *CE->getParameters()) {
-              if (P->hasInterfaceType()) {
-                TS->ParamDeclInterfaceTypes[P] = P->getInterfaceType();
-                P->setInterfaceType(Type());
-              }
-            }
 
           expr->setType(nullptr);
 
@@ -470,12 +458,6 @@ namespace {
 
       for (auto patternElt : PatternTypes)
         patternElt.first->setType(patternElt.second);
-
-      for (auto paramDeclIfaceElt : ParamDeclInterfaceTypes) {
-        assert(!paramDeclIfaceElt.first->isImmutable() ||
-               !paramDeclIfaceElt.second->is<InOutType>());
-        paramDeclIfaceElt.first->setInterfaceType(paramDeclIfaceElt.second->getInOutObjectType());
-      }
 
       // Done, don't do redundant work on destruction.
       ExprTypes.clear();
@@ -502,33 +484,6 @@ namespace {
       for (auto patternElt : PatternTypes)
         if (!patternElt.first->hasType())
           patternElt.first->setType(patternElt.second);
-
-      for (auto paramDeclIfaceElt : ParamDeclInterfaceTypes)
-        if (!paramDeclIfaceElt.first->hasInterfaceType()) {
-          paramDeclIfaceElt.first->setInterfaceType(
-              getParamBaseType(paramDeclIfaceElt));
-        }
-    }
-
-  private:
-    static Type getParamBaseType(std::pair<ParamDecl *, Type> &storedParam) {
-      ParamDecl *param;
-      Type storedType;
-
-      std::tie(param, storedType) = storedParam;
-
-      // FIXME: We are currently in process of removing `InOutType`
-      //        so `VarDecl::get{Interface}Type` is going to wrap base
-      //        type into `InOutType` if its flag indicates that it's
-      //        an `inout` parameter declaration. But such type can't
-      //        be restored directly using `VarDecl::set{Interface}Type`
-      //        caller needs additional logic to extract base type.
-      if (auto *IOT = storedType->getAs<InOutType>()) {
-        assert(param->isInOut());
-        return IOT->getObjectType();
-      }
-
-      return storedType;
     }
   };
 } // end anonymous namespace