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

Merge pull request #85422 from hamishknight/modulo-module

Browse Source 
[AST] NFC: Rename `LookupConformanceInModuleRequest` -> `LookupConformanceRequest`
This commit is contained in:
Hamish Knight
2025-11-11 14:12:12 +00:00
committed by GitHub
parent 42cfda1b2a 5e1279516b
commit 7821c2c89c
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/swift/AST/NameLookupRequests.h
View File

@@ -776,10 +776,11 @@ void simple_display(llvm::raw_ostream &out,
SourceLoc extractNearestSourceLoc(const LookupConformanceDescriptor &desc); SourceLoc extractNearestSourceLoc(const LookupConformanceDescriptor &desc);
class LookupConformanceInModuleRequest class LookupConformanceRequest
: public SimpleRequest<LookupConformanceInModuleRequest, : public SimpleRequest<LookupConformanceRequest,
ProtocolConformanceRef(LookupConformanceDescriptor), ProtocolConformanceRef(LookupConformanceDescriptor),
RequestFlags::Uncached|RequestFlags::DependencySink> { RequestFlags::Uncached |
RequestFlags::DependencySink> {
public: public:
using SimpleRequest::SimpleRequest; using SimpleRequest::SimpleRequest;

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

@@ -52,7 +52,7 @@ SWIFT_REQUEST(NameLookup, AllInheritedProtocolsRequest,
SWIFT_REQUEST(NameLookup, ProtocolRequirementsRequest, SWIFT_REQUEST(NameLookup, ProtocolRequirementsRequest,
ArrayRef<ValueDecl *>(ProtocolDecl *), SeparatelyCached, ArrayRef<ValueDecl *>(ProtocolDecl *), SeparatelyCached,
NoLocationInfo) NoLocationInfo)
SWIFT_REQUEST(NameLookup, LookupConformanceInModuleRequest, SWIFT_REQUEST(NameLookup, LookupConformanceRequest,
ProtocolConformanceRef(LookupConformanceDescriptor), ProtocolConformanceRef(LookupConformanceDescriptor),
Uncached, NoLocationInfo) Uncached, NoLocationInfo)
SWIFT_REQUEST(NameLookup, LookupInModuleRequest, SWIFT_REQUEST(NameLookup, LookupInModuleRequest,

6
lib/AST/ConformanceLookup.cpp
View File

@@ -202,7 +202,7 @@ ProtocolConformanceRef swift::lookupConformance(Type type,
// If we are recursively checking for implicit conformance of a nominal // If we are recursively checking for implicit conformance of a nominal
// type to a KnownProtocol, fail without evaluating this request. This // type to a KnownProtocol, fail without evaluating this request. This
// squashes cycles. // squashes cycles.
LookupConformanceInModuleRequest request{{type, protocol}}; LookupConformanceRequest request{{type, protocol}};
if (auto kp = protocol->getKnownProtocolKind()) { if (auto kp = protocol->getKnownProtocolKind()) {
if (auto nominal = type->getAnyNominal()) { if (auto nominal = type->getAnyNominal()) {
ImplicitKnownProtocolConformanceRequest icvRequest{nominal, *kp}; ImplicitKnownProtocolConformanceRequest icvRequest{nominal, *kp};
@@ -543,8 +543,8 @@ static ProtocolConformanceRef getPackTypeConformance(
} }
ProtocolConformanceRef ProtocolConformanceRef
LookupConformanceInModuleRequest::evaluate( LookupConformanceRequest::evaluate(Evaluator &evaluator,
Evaluator &evaluator, LookupConformanceDescriptor desc) const { LookupConformanceDescriptor desc) const {
auto type = desc.Ty; auto type = desc.Ty;
auto *protocol = desc.PD; auto *protocol = desc.PD;
ASTContext &ctx = protocol->getASTContext(); ASTContext &ctx = protocol->getASTContext();

4
lib/AST/NameLookupRequests.cpp
View File

@@ -427,10 +427,10 @@ void ModuleQualifiedLookupRequest::writeDependencySink(
} }
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
// LookupConformanceInModuleRequest computation. // LookupConformanceRequest computation.
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
void LookupConformanceInModuleRequest::writeDependencySink( void LookupConformanceRequest::writeDependencySink(
evaluator::DependencyCollector &reqTracker, evaluator::DependencyCollector &reqTracker,
ProtocolConformanceRef lookupResult) const { ProtocolConformanceRef lookupResult) const {
if (lookupResult.isInvalid() || !lookupResult.isConcrete()) if (lookupResult.isInvalid() || !lookupResult.isConcrete())