Remove unnecesary interface type resets

Now that setInvalid() is a semantic property, drop the explicit calls to
reset the interface type.  It is already ErrorType.

Author: CodaFi

lib/Sema/ConstraintSystem.cpp

@@ -828,7 +828,7 @@ Type ConstraintSystem::getUnopenedTypeOfReference(VarDecl *value, Type baseType,
           if (!var->isInvalid()) {
             TC.diagnose(var->getLoc(), diag::recursive_decl_reference,
                         var->getDescriptiveKind(), var->getName());
-            var->setInterfaceType(ErrorType::get(getASTContext()));
+            var->setInvalid();
           }
           return ErrorType::get(TC.Context);
         }

lib/Sema/TypeCheckConstraints.cpp

@@ -2815,10 +2815,10 @@ bool TypeChecker::typeCheckBinding(Pattern *&pattern, Expr *&initializer,
       // compute a type for.
       if (var->hasInterfaceType() &&
           !var->getType()->hasUnboundGenericType() &&
-          !var->getType()->hasError())
+          !var->isInvalid())
         return;
 
-      var->setInterfaceType(ErrorType::get(Context));
+      var->setInvalid();
     });
   }
 
@@ -3034,7 +3034,7 @@ bool TypeChecker::typeCheckStmtCondition(StmtCondition &cond, DeclContext *dc,
         // compute a type for.
         if (var->hasInterfaceType() && !var->getType()->hasError())
           return;
-        var->setInterfaceType(ErrorType::get(Context));
+        var->setInvalid();
       });
     };
 

lib/Sema/TypeCheckDecl.cpp

@@ -713,19 +713,13 @@ static void checkRedeclaration(ASTContext &ctx, ValueDecl *current) {
     if (!other->isAccessibleFrom(currentDC))
       continue;
 
-    const auto markInvalid = [&current]() {
-      current->setInvalid();
-      if (current->hasInterfaceType())
-        current->setInterfaceType(ErrorType::get(current->getInterfaceType()));
-    };
-
     // Thwart attempts to override the same declaration more than once.
     const auto *currentOverride = current->getOverriddenDecl();
     const auto *otherOverride = other->getOverriddenDecl();
     if (currentOverride && currentOverride == otherOverride) {
       current->diagnose(diag::multiple_override, current->getFullName());
       other->diagnose(diag::multiple_override_prev, other->getFullName());
-      markInvalid();
+      current->setInvalid();
       break;
     }
 
@@ -872,7 +866,7 @@ static void checkRedeclaration(ASTContext &ctx, ValueDecl *current) {
             other->diagnose(diag::invalid_redecl_prev, other->getFullName());
           });
         }
-        markInvalid();
+        current->setInvalid();
       }
 
       // Make sure we don't do this checking again for the same decl. We also
@@ -2463,7 +2457,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         auto markVarAndPBDInvalid = [PBD, var] {
           PBD->setInvalid();
           var->setInvalid();
-          var->setInterfaceType(ErrorType::get(var->getASTContext()));
         };
 
         // Properties with an opaque return type need an initializer to

lib/Sema/TypeCheckGeneric.cpp

@@ -421,7 +421,6 @@ void TypeChecker::checkReferencedGenericParams(GenericContext *dc) {
 
   // Check that every generic parameter type from the signature is
   // among referencedGenericParams.
-  auto &ctx = decl->getASTContext();
   for (auto *genParam : genericSig->getGenericParams()) {
     auto *paramDecl = genParam->getDecl();
     if (paramDecl->getDepth() != fnGenericParamsDepth)
@@ -439,10 +438,8 @@ void TypeChecker::checkReferencedGenericParams(GenericContext *dc) {
           continue;
       }
       // Produce an error that this generic parameter cannot be bound.
-      ctx.Diags.diagnose(paramDecl->getLoc(),
-                         diag::unreferenced_generic_parameter,
-                         paramDecl->getNameStr());
-      decl->setInterfaceType(ErrorType::get(ctx));
+      paramDecl->diagnose(diag::unreferenced_generic_parameter,
+                          paramDecl->getNameStr());
       decl->setInvalid();
     }
   }

lib/Sema/TypeCheckPattern.cpp

@@ -787,7 +787,6 @@ bool TypeChecker::typeCheckPattern(Pattern *P, DeclContext *dc,
     P->setType(ErrorType::get(Context));
     if (auto named = dyn_cast<NamedPattern>(P)) {
       if (auto var = named->getDecl()) {
-        var->setInterfaceType(ErrorType::get(Context));
         var->setInvalid();
       }
     }

lib/Sema/TypeCheckStmt.cpp

@@ -1064,7 +1064,6 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
       // If that failed, mark any variables binding pieces of the pattern
       // as invalid to silence follow-on errors.
       pattern->forEachVariable([&](VarDecl *VD) {
-        VD->setInterfaceType(ErrorType::get(TC.Context));
         VD->setInvalid();
       });
     }
@@ -1142,10 +1141,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
             !vd->getType()->isEqual(initialCaseVarDecl->getType())) {
           TC.diagnose(vd->getLoc(), diag::type_mismatch_multiple_pattern_list,
                       vd->getType(), initialCaseVarDecl->getType());
-          vd->setInterfaceType(ErrorType::get(TC.Context));
           vd->setInvalid();
-
-          initialCaseVarDecl->setInterfaceType(ErrorType::get(TC.Context));
           initialCaseVarDecl->setInvalid();
         }
 
@@ -1166,10 +1162,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
         if (foundVP)
           diag.fixItReplace(foundVP->getLoc(),
                             initialCaseVarDecl->isLet() ? "let" : "var");
-        vd->setInterfaceType(ErrorType::get(TC.Context));
         vd->setInvalid();
-
-        initialCaseVarDecl->setInterfaceType(ErrorType::get(TC.Context));
         initialCaseVarDecl->setInvalid();
       }
     });
@@ -1237,10 +1230,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
           TC.diagnose(previous->getLoc(),
                       diag::type_mismatch_fallthrough_pattern_list,
                       previous->getType(), expected->getType());
-          previous->setInterfaceType(ErrorType::get(TC.Context));
           previous->setInvalid();
-
-          expected->setInterfaceType(ErrorType::get(TC.Context));
           expected->setInvalid();
         }
 
@@ -1476,7 +1466,6 @@ bool TypeChecker::typeCheckCatchPattern(CatchStmt *S, DeclContext *DC) {
       // before we type-check the guard.  (This will probably kill
       // most of the type-checking, but maybe not.)
       pattern->forEachVariable([&](VarDecl *var) {
-        var->setInterfaceType(ErrorType::get(Context));
         var->setInvalid();
       });
     }

lib/Sema/TypeCheckStorage.cpp

@@ -42,7 +42,6 @@ void swift::setBoundVarsTypeError(Pattern *pattern, ASTContext &ctx) {
     if (var->hasInterfaceType())
       return;
 
-    var->setInterfaceType(ErrorType::get(var->getASTContext()));
     var->setInvalid();
   });
 }