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

Use the default constructor to clean up some APIs

Browse Source 
Use ProtocolConformanceRef::forInvalid() in implementations only as a semantic signal.  In one place, use the default constructor to drop the final use of Optional<ProtocolConformanceRef>.
This commit is contained in:
Robert Widmann
2019-10-29 16:35:10 -07:00
parent b849e51768
commit 4f84c2a628
9 changed files with 41 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Sema/CSRanking.cpp
View File

@@ -206,8 +206,7 @@ computeSelfTypeRelationship(TypeChecker &tc, DeclContext *dc, ValueDecl *decl1,
// If both declarations are operators, even through they
// might have Self such types are unrelated.
if (decl1->isOperator() && decl2->isOperator())
return {SelfTypeRelationship::Unrelated,
ProtocolConformanceRef::forInvalid()};
return {SelfTypeRelationship::Unrelated, ProtocolConformanceRef()};
auto *dc1 = decl1->getDeclContext();
auto *dc2 = decl2->getDeclContext();
@@ -215,38 +214,32 @@ computeSelfTypeRelationship(TypeChecker &tc, DeclContext *dc, ValueDecl *decl1,
// If at least one of the contexts is a non-type context, the two are
// unrelated.
if (!dc1->isTypeContext() || !dc2->isTypeContext())
return {SelfTypeRelationship::Unrelated,
ProtocolConformanceRef::forInvalid()};
return {SelfTypeRelationship::Unrelated, ProtocolConformanceRef()};
Type type1 = dc1->getDeclaredInterfaceType();
Type type2 = dc2->getDeclaredInterfaceType();
// If the types are equal, the answer is simple.
if (type1->isEqual(type2))
return {SelfTypeRelationship::Equivalent,
ProtocolConformanceRef::forInvalid()};
return {SelfTypeRelationship::Equivalent, ProtocolConformanceRef()};
// If both types can have superclasses, which whether one is a superclass
// of the other. The subclass is the common base type.
if (type1->mayHaveSuperclass() && type2->mayHaveSuperclass()) {
if (isNominallySuperclassOf(type1, type2))
return {SelfTypeRelationship::Superclass,
ProtocolConformanceRef::forInvalid()};
return {SelfTypeRelationship::Superclass, ProtocolConformanceRef()};
if (isNominallySuperclassOf(type2, type1))
return {SelfTypeRelationship::Subclass,
ProtocolConformanceRef::forInvalid()};
return {SelfTypeRelationship::Subclass, ProtocolConformanceRef()};
return {SelfTypeRelationship::Unrelated,
ProtocolConformanceRef::forInvalid()};
return {SelfTypeRelationship::Unrelated, ProtocolConformanceRef()};
}
// If neither or both are protocol types, consider the bases unrelated.
bool isProtocol1 = isa<ProtocolDecl>(dc1);
bool isProtocol2 = isa<ProtocolDecl>(dc2);
if (isProtocol1 == isProtocol2)
return {SelfTypeRelationship::Unrelated,
ProtocolConformanceRef::forInvalid()};
return {SelfTypeRelationship::Unrelated, ProtocolConformanceRef()};
// Just one of the two is a protocol. Check whether the other conforms to
// that protocol.