averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sema: Rename TypeCheckSourceFileRequest to TypeCheckPrimaryFileRequest

Browse Source
This commit is contained in:
Slava Pestov
2025-02-24 12:20:31 -05:00
parent 874c62513c
commit b35f929dc8
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/AST/SimpleRequest.h
View File

@@ -57,7 +57,7 @@ enum class RequestFlags {
/// incremental dependency pair and defines a new dependency scope. /// incremental dependency pair and defines a new dependency scope.
/// ///
/// This bit is optional. High-level requests /// 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 /// For further discussion on incremental dependencies
/// see DependencyAnalysis.md. /// see DependencyAnalysis.md.

4
include/swift/AST/TypeCheckRequests.h
View File

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

2
include/swift/AST/TypeCheckerTypeIDZone.def
View File

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

8
lib/AST/TypeCheckRequests.cpp
View File

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

2
lib/Sema/TypeCheckDeclPrimary.cpp
View File

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

4
lib/Sema/TypeChecker.cpp
View File

@@ -251,11 +251,11 @@ void swift::performTypeChecking(SourceFile &SF) {
} }
return (void)evaluateOrDefault(SF.getASTContext().evaluator, return (void)evaluateOrDefault(SF.getASTContext().evaluator,
TypeCheckSourceFileRequest{&SF}, {}); TypeCheckPrimaryFileRequest{&SF}, {});
} }
evaluator::SideEffect 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 && "Source file cannot be null!");
assert(SF->ASTStage != SourceFile::TypeChecked && assert(SF->ASTStage != SourceFile::TypeChecked &&
"Should not be re-typechecking this file!"); "Should not be re-typechecking this file!");

2
test/Frontend/debug-cycles.swift
View File

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