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

Sema: Small NFC cleanup for LookupResultBuilder::add()

Browse Source
This commit is contained in:
Slava Pestov
2017-07-27 23:22:58 -07:00
parent f51a9d022c
commit bfb252ab39
1 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
lib/Sema/TypeCheckNameLookup.cpp
View File

@@ -129,6 +129,12 @@ namespace {
assert(isa<ProtocolDecl>(foundDC)); assert(isa<ProtocolDecl>(foundDC));
if (!Options.contains(NameLookupFlags::PerformConformanceCheck))
return;
// If we found something within the protocol itself, and our
// search began somewhere that is not in a protocol or extension
// thereof, remap this declaration to the witness.
auto conformingType = foundInType; auto conformingType = foundInType;
// When performing a lookup on a subclass existential, we might // When performing a lookup on a subclass existential, we might
@@ -143,50 +149,43 @@ namespace {
conformingType = layout.superclass; conformingType = layout.superclass;
} }
// If we found something within the protocol itself, and our // Dig out the protocol conformance.
// search began somewhere that is not in a protocol or extension auto conformance = TC.conformsToProtocol(conformingType, foundProto, DC,
// thereof, remap this declaration to the witness.
if (Options.contains(NameLookupFlags::PerformConformanceCheck)) {
// Dig out the protocol conformance.
auto conformance = TC.conformsToProtocol(conformingType, foundProto, DC,
conformanceOptions); conformanceOptions);
if (!conformance) { if (!conformance) {
// If there's no conformance, we have an existential // If there's no conformance, we have an existential
// and we found a member from one of the protocols, and // and we found a member from one of the protocols, and
// not a class constraint if any. // not a class constraint if any.
assert(foundInType->isExistentialType()); assert(foundInType->isExistentialType());
addResult(found); addResult(found);
return;
}
if (conformance->isAbstract()) {
assert(foundInType->is<ArchetypeType>() ||
foundInType->isExistentialType());
addResult(found);
return;
}
// Dig out the witness.
ValueDecl *witness = nullptr;
auto concrete = conformance->getConcrete();
if (auto assocType = dyn_cast<AssociatedTypeDecl>(found)) {
witness = concrete->getTypeWitnessAndDecl(assocType, &TC)
.second;
} else if (found->isProtocolRequirement()) {
witness = concrete->getWitnessDecl(found, &TC);
}
// FIXME: the "isa<ProtocolDecl>()" check will be wrong for
// default implementations in protocols.
//
// If we have an imported conformance or the witness could
// not be deserialized, getWitnessDecl() will just return
// the requirement, so just drop the lookup result here.
if (witness && !isa<ProtocolDecl>(witness->getDeclContext()))
addResult(witness);
return; return;
} }
if (conformance->isAbstract()) {
assert(foundInType->is<ArchetypeType>() ||
foundInType->isExistentialType());
addResult(found);
return;
}
// Dig out the witness.
ValueDecl *witness = nullptr;
auto concrete = conformance->getConcrete();
if (auto assocType = dyn_cast<AssociatedTypeDecl>(found)) {
witness = concrete->getTypeWitnessAndDecl(assocType, &TC)
.second;
} else if (found->isProtocolRequirement()) {
witness = concrete->getWitnessDecl(found, &TC);
}
// FIXME: the "isa<ProtocolDecl>()" check will be wrong for
// default implementations in protocols.
//
// If we have an imported conformance or the witness could
// not be deserialized, getWitnessDecl() will just return
// the requirement, so just drop the lookup result here.
if (witness && !isa<ProtocolDecl>(witness->getDeclContext()))
addResult(witness);
} }
}; };
} // end anonymous namespace } // end anonymous namespace