Sema: Rename TypeCheckSourceFileRequest to TypeCheckPrimaryFileRequest

Author: slavapestov

include/swift/AST/SimpleRequest.h

@@ -57,7 +57,7 @@ enum class RequestFlags {
   /// incremental dependency pair and defines a new dependency scope.
   ///
   /// This bit is optional.  High-level requests
-  /// (e.g. \c TypeCheckSourceFileRequest) will require it.
+  /// (e.g. \c TypeCheckPrimaryFileRequest) will require it.
   ///
   /// For further discussion on incremental dependencies
   /// see DependencyAnalysis.md.

include/swift/AST/TypeCheckRequests.h

@@ -3300,9 +3300,9 @@ class ApplyAccessNoteRequest
   void cacheResult(evaluator::SideEffect value) const;
 };
 
-class TypeCheckSourceFileRequest
+class TypeCheckPrimaryFileRequest
     : public SimpleRequest<
-          TypeCheckSourceFileRequest, evaluator::SideEffect(SourceFile *),
+          TypeCheckPrimaryFileRequest, evaluator::SideEffect(SourceFile *),
           RequestFlags::SeparatelyCached | RequestFlags::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -424,7 +424,7 @@ SWIFT_REQUEST(TypeChecker, HasDefaultInitRequest,
               bool(NominalTypeDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, SynthesizeDefaultInitRequest,
               ConstructorDecl *(NominalTypeDecl *), Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, TypeCheckSourceFileRequest,
+SWIFT_REQUEST(TypeChecker, TypeCheckPrimaryFileRequest,
               bool(SouceFile *), SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ConformanceAccessScopeRequest,
               ConformanceAccessScope(DeclContext *, ProtocolDecl *),

lib/AST/TypeCheckRequests.cpp

@@ -1655,24 +1655,24 @@ void RenamedDeclRequest::cacheResult(ValueDecl *value) const {
 }
 
 //----------------------------------------------------------------------------//
-// TypeCheckSourceFileRequest computation.
+// TypeCheckPrimaryFileRequest computation.
 //----------------------------------------------------------------------------//
 
-evaluator::DependencySource TypeCheckSourceFileRequest::readDependencySource(
+evaluator::DependencySource TypeCheckPrimaryFileRequest::readDependencySource(
     const evaluator::DependencyRecorder &e) const {
   return std::get<0>(getStorage());
 }
 
 std::optional<evaluator::SideEffect>
-TypeCheckSourceFileRequest::getCachedResult() const {
+TypeCheckPrimaryFileRequest::getCachedResult() const {
   auto *SF = std::get<0>(getStorage());
   if (SF->ASTStage == SourceFile::TypeChecked)
     return std::make_tuple<>();
 
   return std::nullopt;
 }
 
-void TypeCheckSourceFileRequest::cacheResult(evaluator::SideEffect) const {
+void TypeCheckPrimaryFileRequest::cacheResult(evaluator::SideEffect) const {
   auto *SF = std::get<0>(getStorage());
 
   // Verify that we've checked types correctly.

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -3991,7 +3991,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       return;
     }
 
-    // Record a dependency from TypeCheckSourceFileRequest to
+    // Record a dependency from TypeCheckPrimaryFileRequest to
     // ExtendedNominalRequest, since the call to getExtendedNominal()
     // above doesn't record a dependency when reading a cached value.
     ED->computeExtendedNominal();

lib/Sema/TypeChecker.cpp

@@ -251,11 +251,11 @@ void swift::performTypeChecking(SourceFile &SF) {
   }
 
   return (void)evaluateOrDefault(SF.getASTContext().evaluator,
-                                 TypeCheckSourceFileRequest{&SF}, {});
+                                 TypeCheckPrimaryFileRequest{&SF}, {});
 }
 
 evaluator::SideEffect
-TypeCheckSourceFileRequest::evaluate(Evaluator &eval, SourceFile *SF) const {
+TypeCheckPrimaryFileRequest::evaluate(Evaluator &eval, SourceFile *SF) const {
   assert(SF && "Source file cannot be null!");
   assert(SF->ASTStage != SourceFile::TypeChecked &&
          "Should not be re-typechecking this file!");

test/Frontend/debug-cycles.swift

@@ -5,7 +5,7 @@ class Outer2: Outer2.Inner {
   class Inner {}
 }
 // CHECK:===CYCLE DETECTED===
-// CHECK-NEXT: `--TypeCheckSourceFileRequest({{.*}})
+// CHECK-NEXT: `--TypeCheckPrimaryFileRequest({{.*}})
 // CHECK-NEXT:     `--SuperclassDeclRequest({{.*}})
 // CHECK-NEXT:         `--InheritedDeclsReferencedRequest({{.*}})
 // CHECK-NEXT:             `--QualifiedLookupRequest({{.*}})