Remove unused TypeCheckers

Author: CodaFi

lib/Frontend/Frontend.cpp

@@ -852,12 +852,12 @@ void CompilerInstance::parseAndCheckTypesUpTo(
   }) && "some files have not yet had their imports resolved");
   MainModule->setHasResolvedImports();
 
-  // If the limiting AST stage is name binding, we're done.
-  if (limitStage <= SourceFile::NameBound) {
-    return;
-  }
-
   forEachFileToTypeCheck([&](SourceFile &SF) {
+    if (limitStage == SourceFile::NameBound) {
+      bindExtensions(SF);
+      return;
+    }
+
     performTypeChecking(SF, PersistentState->getTopLevelContext());
 
     if (!Context->hadError() && Invocation.getFrontendOptions().PCMacro) {
@@ -874,9 +874,16 @@ void CompilerInstance::parseAndCheckTypesUpTo(
   });
 
   if (Invocation.isCodeCompletion()) {
+    assert(limitStage == SourceFile::NameBound);
     performCodeCompletionSecondPass(*PersistentState.get(),
                                     *Invocation.getCodeCompletionFactory());
   }
+
+  // If the limiting AST stage is name binding, we're done.
+  if (limitStage <= SourceFile::NameBound) {
+    return;
+  }
+
   finishTypeChecking();
 }
 

lib/IDE/REPLCodeCompletion.cpp

@@ -212,7 +212,6 @@ doCodeCompletion(SourceFile &SF, StringRef EnteredCode, unsigned *BufferID,
   do {
     parseIntoSourceFile(SF, *BufferID, &Done, nullptr, &PersistentState);
   } while (!Done);
-  llvm::SaveAndRestore<TypeCheckerOptions> clearTyOpts(Ctx.TypeCheckerOpts, {});
   performTypeChecking(SF, PersistentState.getTopLevelContext(),
                       OriginalDeclCount);
 

lib/Immediate/REPL.cpp

@@ -193,7 +193,6 @@ typeCheckREPLInput(ModuleDecl *MostRecentModule, StringRef Name,
         parseIntoSourceFile(REPLInputFile, BufferID, &Done, nullptr,
                             &PersistentState);
   } while (!Done);
-  llvm::SaveAndRestore<TypeCheckerOptions> clearTyOpts(Ctx.TypeCheckerOpts, {});
   performTypeChecking(REPLInputFile, PersistentState.getTopLevelContext());
   return REPLModule;
 }

lib/Sema/CSGen.cpp

@@ -3861,9 +3861,8 @@ getMemberDecls(InterestedMemberKind Kind) {
 ResolvedMemberResult
 swift::resolveValueMember(DeclContext &DC, Type BaseTy, DeclName Name) {
   ResolvedMemberResult Result;
-  // If the current ast context has no type checker, create one for it.
-  auto *TC = DC.getASTContext().getLegacyGlobalTypeChecker();
-  assert(TC && "Must have type checker to make global query!");
+  assert(DC.getASTContext().getLegacyGlobalTypeChecker() &&
+         "Must have type checker to make global query!");
   ConstraintSystem CS(&DC, None);
 
   // Look up all members of BaseTy with the given Name.

lib/Sema/InstrumenterSupport.cpp

@@ -116,9 +116,7 @@ bool InstrumenterBase::doTypeCheckImpl(ASTContext &Ctx, DeclContext *DC,
   DiagnosticSuppression suppression(Ctx.Diags);
   ErrorGatherer errorGatherer(Ctx.Diags);
 
-  auto *TC = Ctx.getLegacyGlobalTypeChecker();
-  assert(TC && "Must have type checker installed!");
-  TC->typeCheckExpression(parsedExpr, DC);
+  TypeChecker::typeCheckExpression(parsedExpr, DC);
 
   if (parsedExpr) {
     ErrorFinder errorFinder;

lib/Sema/TypeCheckConstraints.cpp

@@ -2161,6 +2161,7 @@ Type TypeChecker::typeCheckExpression(Expr *&expr, DeclContext *dc,
   auto &Context = dc->getASTContext();
   FallbackDiagnosticListener diagListener(Context, options, listener);
   auto *TC = Context.getLegacyGlobalTypeChecker();
+  assert(TC && "Must have a global type checker set");
   return TC->typeCheckExpressionImpl(expr, dc, convertType, convertTypePurpose,
                                      options, diagListener, baseCS);
 }

lib/Sema/TypeCheckDecl.cpp

@@ -1666,11 +1666,10 @@ EnumRawValuesRequest::evaluate(Evaluator &eval, EnumDecl *ED,
 
 
     {
-      auto *TC = ED->getASTContext().getLegacyGlobalTypeChecker();
-      assert(TC && "Must have a global type checker set");
       Expr *exprToCheck = prevValue;
-      if (TC->typeCheckExpression(exprToCheck, ED, TypeLoc::withoutLoc(rawTy),
-                                  CTP_EnumCaseRawValue)) {
+      if (TypeChecker::typeCheckExpression(exprToCheck, ED,
+                                           TypeLoc::withoutLoc(rawTy),
+                                           CTP_EnumCaseRawValue)) {
         TypeChecker::checkEnumElementErrorHandling(elt, exprToCheck);
       }
     }
@@ -3180,9 +3179,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
 
   bool shouldSkipBodyTypechecking(const AbstractFunctionDecl *AFD) {
-    // FIXME: Remove TypeChecker dependency.
-    auto &TC = *Ctx.getLegacyGlobalTypeChecker();
-
     // Make sure we're in the mode that's skipping function bodies.
     if (!getASTContext().TypeCheckerOpts.SkipNonInlinableFunctionBodies)
       return false;

lib/Sema/TypeCheckProtocolInference.cpp

@@ -208,14 +208,14 @@ AssociatedTypeInference::inferTypeWitnessesViaValueWitnesses(
     // because those have to be explicitly declared on the type somewhere
     // so won't be affected by whatever answer inference comes up with.
     auto selfTy = extension->getSelfInterfaceType();
-    auto *tc = getASTContext().getLegacyGlobalTypeChecker();
     for (const Requirement &reqt : extensionSig->getRequirements()) {
       switch (reqt.getKind()) {
       case RequirementKind::Conformance:
       case RequirementKind::Superclass:
         // FIXME: This is the wrong check
         if (selfTy->isEqual(reqt.getFirstType()) &&
-            !tc->isSubtypeOf(conformance->getType(), reqt.getSecondType(), dc))
+            !TypeChecker::isSubtypeOf(conformance->getType(),
+                                      reqt.getSecondType(), dc))
           return false;
         break;
 

lib/Sema/TypeCheckREPL.cpp

@@ -255,10 +255,8 @@ void REPLChecker::generatePrintOfExpression(StringRef NameStr, Expr *E) {
   BraceStmt *Body = builder.createBodyStmt(Loc, EndLoc);
   CE->setBody(Body, false);
 
-  // FIXME: Remove TypeChecker dependency.
-  auto &TC = *Context.getLegacyGlobalTypeChecker();
   TypeChecker::typeCheckClosureBody(CE);
-  TC.ClosuresWithUncomputedCaptures.push_back(CE);
+  TypeChecker::computeCaptures(CE);
 
   auto *TheCall = CallExpr::createImplicit(Context, CE, { E }, { });
   TheCall->getArg()->setType(AnyFunctionType::composeInput(Context, args, false));

lib/Sema/TypeCheckStmt.cpp

@@ -1280,9 +1280,6 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
   }
 
   Stmt *visitSwitchStmt(SwitchStmt *switchStmt) {
-    // FIXME: Remove TypeChecker dependency.
-    auto &TC = *Ctx.getLegacyGlobalTypeChecker();
-
     // Type-check the subject expression.
     Expr *subjectExpr = switchStmt->getSubjectExpr();
     auto resultTy = TypeChecker::typeCheckExpression(subjectExpr, DC);