Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/swift/AST/NameLookupRequests.h
Original file line number Diff line number Diff line change
Expand Up @@ -776,10 +776,11 @@ void simple_display(llvm::raw_ostream &out,

SourceLoc extractNearestSourceLoc(const LookupConformanceDescriptor &desc);

class LookupConformanceInModuleRequest
: public SimpleRequest<LookupConformanceInModuleRequest,
class LookupConformanceRequest
: public SimpleRequest<LookupConformanceRequest,
ProtocolConformanceRef(LookupConformanceDescriptor),
RequestFlags::Uncached|RequestFlags::DependencySink> {
RequestFlags::Uncached |
RequestFlags::DependencySink> {
public:
using SimpleRequest::SimpleRequest;

Expand Down
2 changes: 1 addition & 1 deletion include/swift/AST/NameLookupTypeIDZone.def
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SWIFT_REQUEST(NameLookup, AllInheritedProtocolsRequest,
SWIFT_REQUEST(NameLookup, ProtocolRequirementsRequest,
ArrayRef<ValueDecl *>(ProtocolDecl *), SeparatelyCached,
NoLocationInfo)
SWIFT_REQUEST(NameLookup, LookupConformanceInModuleRequest,
SWIFT_REQUEST(NameLookup, LookupConformanceRequest,
ProtocolConformanceRef(LookupConformanceDescriptor),
Uncached, NoLocationInfo)
SWIFT_REQUEST(NameLookup, LookupInModuleRequest,
Expand Down
6 changes: 3 additions & 3 deletions lib/AST/ConformanceLookup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ ProtocolConformanceRef swift::lookupConformance(Type type,
// If we are recursively checking for implicit conformance of a nominal
// type to a KnownProtocol, fail without evaluating this request. This
// squashes cycles.
LookupConformanceInModuleRequest request{{type, protocol}};
LookupConformanceRequest request{{type, protocol}};
if (auto kp = protocol->getKnownProtocolKind()) {
if (auto nominal = type->getAnyNominal()) {
ImplicitKnownProtocolConformanceRequest icvRequest{nominal, *kp};
Expand Down Expand Up @@ -543,8 +543,8 @@ static ProtocolConformanceRef getPackTypeConformance(
}

ProtocolConformanceRef
LookupConformanceInModuleRequest::evaluate(
Evaluator &evaluator, LookupConformanceDescriptor desc) const {
LookupConformanceRequest::evaluate(Evaluator &evaluator,
LookupConformanceDescriptor desc) const {
auto type = desc.Ty;
auto *protocol = desc.PD;
ASTContext &ctx = protocol->getASTContext();
Expand Down
4 changes: 2 additions & 2 deletions lib/AST/NameLookupRequests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,10 @@ void ModuleQualifiedLookupRequest::writeDependencySink(
}

//----------------------------------------------------------------------------//
// LookupConformanceInModuleRequest computation.
// LookupConformanceRequest computation.
//----------------------------------------------------------------------------//

void LookupConformanceInModuleRequest::writeDependencySink(
void LookupConformanceRequest::writeDependencySink(
evaluator::DependencyCollector &reqTracker,
ProtocolConformanceRef lookupResult) const {
if (lookupResult.isInvalid() || !lookupResult.isConcrete())
Expand Down