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

Make LookupConformanceFn callbacks return Optional<ProtocolConformanceRef>.

Browse Source 
NFC yet, but this is a step toward centralizing error handling policy for failed conformance lookups instead of leaving it ad-hoc.
This commit is contained in:
Joe Groff
2016-12-14 18:04:35 -08:00
parent 55bdf5954c
commit ccfabd1118
5 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/AST/GenericSignature.cpp
View File

@@ -315,9 +315,10 @@ getSubstitutions(ModuleDecl &mod,
for (auto req: reqs) {
assert(req.getKind() == RequirementKind::Conformance);
auto protoType = req.getSecondType()->castTo<ProtocolType>();
// TODO: Error handling for failed conformance lookup.
currentConformances.push_back(
lookupConformance(depTy->getCanonicalType(), currentReplacement,
protoType));
*lookupConformance(depTy->getCanonicalType(), currentReplacement,
protoType));
}
// Add it to the final substitution list.
@@ -336,9 +337,9 @@ getSubstitutions(ModuleDecl &mod,
SmallVectorImpl<Substitution> &result) const {
auto lookupConformanceFn =
[&](CanType original, Type replacement, ProtocolType *protoType)
-> ProtocolConformanceRef {
return *subMap.lookupConformance(original, protoType->getDecl());
};
-> Optional<ProtocolConformanceRef> {
return subMap.lookupConformance(original, protoType->getDecl());
};
getSubstitutions(mod, subMap.getMap(), lookupConformanceFn, result);
}