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

[NFC] Fold The Tri-State In Optional<ProtocolConformanceRef>

Browse Source 
ProtocolConformanceRef already has an invalid state.  Drop all of the
uses of Optional<ProtocolConformanceRef> and just use
ProtocolConformanceRef::forInvalid() to represent it.  Mechanically
translate all of the callers and callsites to use this new
representation.
This commit is contained in:
Robert Widmann
2019-10-29 15:11:15 -07:00
parent 9565300f1b
commit 3e1a61f425
81 changed files with 882 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Sema/CodeSynthesis.cpp
View File

@@ -427,9 +427,10 @@ configureGenericDesignatedInitOverride(ASTContext &ctx,
};
auto lookupConformanceFn =
[&](CanType depTy, Type substTy, ProtocolDecl *proto)
-> Optional<ProtocolConformanceRef> {
if (auto conf = subMap.lookupConformance(depTy, proto))
[&](CanType depTy, Type substTy,
ProtocolDecl *proto) -> ProtocolConformanceRef {
auto conf = subMap.lookupConformance(depTy, proto);
if (!conf.isInvalid())
return conf;
return ProtocolConformanceRef(proto);
@@ -1075,20 +1076,22 @@ void TypeChecker::synthesizeMemberForLookup(NominalTypeDecl *target,
return false;
auto targetType = target->getDeclaredInterfaceType();
if (auto ref = conformsToProtocol(
targetType, protocol, target,
ConformanceCheckFlags::SkipConditionalRequirements)) {
if (auto *conformance = dyn_cast<NormalProtocolConformance>(
ref->getConcrete()->getRootConformance())) {
if (conformance->getState() == ProtocolConformanceState::Incomplete) {
checkConformance(conformance);
}
}
auto ref =
conformsToProtocol(targetType, protocol, target,
ConformanceCheckFlags::SkipConditionalRequirements);
return true;
if (ref.isInvalid()) {
return false;
}
return false;
if (auto *conformance = dyn_cast<NormalProtocolConformance>(
ref.getConcrete()->getRootConformance())) {
if (conformance->getState() == ProtocolConformanceState::Incomplete) {
checkConformance(conformance);
}
}
return true;
};
if (member.isSimpleName() && !baseName.isSpecial()) {