Merge pull request #28104 from CodaFi/broken-declspec

[NFC] Drop More Type Checkers

Author: CodaFi

lib/IDE/ExprContextAnalysis.cpp

@@ -74,7 +74,7 @@ void typeCheckContextImpl(DeclContext *DC, SourceLoc Loc) {
 
   case DeclContextKind::AbstractFunctionDecl: {
     auto *AFD = cast<AbstractFunctionDecl>(DC);
-    typeCheckAbstractFunctionBodyUntil(AFD, Loc);
+    swift::typeCheckAbstractFunctionBodyUntil(AFD, Loc);
     break;
   }
 

lib/Sema/CSApply.cpp

@@ -5604,7 +5604,7 @@ ClosureExpr *ExprRewriter::coerceClosureExprToVoid(ClosureExpr *closureExpr) {
                  cs.getType(singleExpr)->getWithoutSpecifierType());
 
     cs.setExprTypes(singleExpr);
-    tc.checkIgnoredExpr(singleExpr);
+    TypeChecker::checkIgnoredExpr(singleExpr);
 
     SmallVector<ASTNode, 2> elements;
     elements.push_back(singleExpr);
@@ -5643,7 +5643,7 @@ ClosureExpr *ExprRewriter::coerceClosureExprFromNever(ClosureExpr *closureExpr)
     auto singleExpr = returnStmt->getResult();
 
     cs.setExprTypes(singleExpr);
-    tc.checkIgnoredExpr(singleExpr);
+    TypeChecker::checkIgnoredExpr(singleExpr);
 
     SmallVector<ASTNode, 1> elements;
     elements.push_back(singleExpr);

lib/Sema/CSGen.cpp

@@ -2323,7 +2323,7 @@ namespace {
           // Okay, now it should be safe to coerce the pattern.
           // Pull the top-level pattern back out.
           pattern = clause->getErrorPattern();
-          Type exnType = CS.TC.getExceptionType(CS.DC, clause->getCatchLoc());
+          Type exnType = CS.getASTContext().getErrorDecl()->getDeclaredType();
           if (!exnType)
             return false;
           if (CS.TC.coercePatternToType(pattern,

lib/Sema/ResilienceDiagnostics.cpp

@@ -84,17 +84,6 @@ TypeChecker::getFragileFunctionKind(const DeclContext *DC) {
   llvm_unreachable("Context is not nested inside a fragile function");
 }
 
-void TypeChecker::diagnoseInlinableLocalType(const NominalTypeDecl *NTD) {
-  auto *DC = NTD->getDeclContext();
-  auto expansion = DC->getResilienceExpansion();
-  if (expansion == ResilienceExpansion::Minimal) {
-    auto kind = getFragileFunctionKind(DC);
-    diagnose(NTD, diag::local_type_in_inlinable_function,
-             NTD->getFullName(),
-             static_cast<unsigned>(kind.first));
-  }
-}
-
 /// A uniquely-typed boolean to reduce the chances of accidentally inverting
 /// a check.
 enum class DowngradeToWarning: bool {

lib/Sema/TypeCheckCircularity.cpp

@@ -98,9 +98,7 @@ class Path {
 };
 
 /// A helper class for performing a circularity check.
-class CircularityChecker {
-  TypeChecker &TC;
-
+class CircularityChecker final {
   /// The original type declaration we're starting with.
   NominalTypeDecl *OriginalDecl;
 
@@ -111,9 +109,9 @@ class CircularityChecker {
   SmallVector<WorkItem, 8> Workstack;
 
 public:
-  CircularityChecker(TypeChecker &tc, NominalTypeDecl *typeDecl)
-    : TC(tc), OriginalDecl(typeDecl),
-      MaxDepth(tc.Context.LangOpts.MaxCircularityDepth) {}
+  CircularityChecker(NominalTypeDecl *typeDecl)
+      : OriginalDecl(typeDecl),
+        MaxDepth(typeDecl->getASTContext().LangOpts.MaxCircularityDepth) {}
 
   void run();
 
@@ -178,7 +176,7 @@ class CircularityChecker {
 } // end anonymous namespace
 
 void TypeChecker::checkDeclCircularity(NominalTypeDecl *decl) {
-  CircularityChecker(*this, decl).run();
+  CircularityChecker(decl).run();
 }
 
 /// The main routine for performing circularity checks.
@@ -523,18 +521,12 @@ bool CircularityChecker::diagnoseCircularity(CanType parentType,
 
   auto baseType = path[0].Ty;
   if (cycleIndex != 0) {
-    TC.diagnose(OriginalDecl->getLoc(),
-                diag::unsupported_infinitely_sized_type,
-                baseType);
+    OriginalDecl->diagnose(diag::unsupported_infinitely_sized_type, baseType);
   } else if (isa<StructDecl>(OriginalDecl)) {
-    TC.diagnose(path[1].Member->getLoc(),
-                diag::unsupported_recursive_struct,
-                baseType);
+    path[1].Member->diagnose(diag::unsupported_recursive_struct, baseType);
   } else if (isa<EnumDecl>(OriginalDecl)) {
-    TC.diagnose(OriginalDecl->getLoc(),
-                diag::recursive_enum_not_indirect,
-                baseType)
-      .fixItInsert(OriginalDecl->getStartLoc(), "indirect ");
+    OriginalDecl->diagnose(diag::recursive_enum_not_indirect, baseType)
+        .fixItInsert(OriginalDecl->getStartLoc(), "indirect ");
   } else {
     llvm_unreachable("what kind of entity was this?");
   }
@@ -545,12 +537,9 @@ bool CircularityChecker::diagnoseCircularity(CanType parentType,
       llvm::raw_svector_ostream out(pathString);
       path.printCycle(out, cycleIndex);
     }
-    TC.diagnose(path[1].Member->getLoc(),
-                diag::note_type_cycle_starts_here,
-                pathString);
+    path[1].Member->diagnose(diag::note_type_cycle_starts_here, pathString);
   } else if (isa<EnumDecl>(OriginalDecl)) {
-    TC.diagnose(path[1].Member->getLoc(),
-                diag::note_recursive_enum_case_here);
+    path[1].Member->diagnose(diag::note_recursive_enum_case_here);
   }
 
   return true;
@@ -573,19 +562,15 @@ bool CircularityChecker::diagnoseInfiniteRecursion(CanType parentType,
   }
 
   auto baseType = path[0].Ty;
-  TC.diagnose(OriginalDecl->getLoc(),
-              diag::unsupported_infinitely_sized_type,
-              baseType);
+  OriginalDecl->diagnose(diag::unsupported_infinitely_sized_type, baseType);
 
   // Add a note about the start of the path.
   llvm::SmallString<128> pathString; {
     llvm::raw_svector_ostream out(pathString);
     path.printInfinite(out);
   }
 
-  TC.diagnose(path[1].Member->getLoc(),
-              diag::note_type_cycle_starts_here,
-              pathString);
+  path[1].Member->diagnose(diag::note_type_cycle_starts_here, pathString);
 
   return true;
 }
@@ -628,5 +613,5 @@ void CircularityChecker::diagnoseNonWellFoundedEnum(EnumDecl *E) {
   };
 
   if (isNonWellFounded())
-    TC.diagnose(E, diag::enum_non_well_founded);
+    E->getASTContext().Diags.diagnose(E, diag::enum_non_well_founded);
 }