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

Distinguish conformance and superclass generic requirements.

Browse Source 
As part of this, use a different enum for parsed generic requirements.

NFC except that I noticed that ASTWalker wasn't visiting the second
type in a conformance constraint; fixing this seems to have no effect
beyond producing better IDE annotations.
This commit is contained in:
John McCall
2016-01-11 16:02:48 -08:00
parent 0b8468d36b
commit 1f3b3142b4
25 changed files with 246 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Sema/ConstraintSystem.cpp
View File

@@ -917,23 +917,26 @@ void ConstraintSystem::openGeneric(
switch (req.getKind()) {
case RequirementKind::Conformance: {
auto subjectTy = req.getFirstType().transform(replaceDependentTypes);
if (auto proto = req.getSecondType()->getAs<ProtocolType>()) {
// Determine whether this is the protocol 'Self' constraint we should
// skip.
if (skipProtocolSelfConstraint &&
(proto->getDecl() == dc->isProtocolOrProtocolExtensionContext() ||
proto->getDecl()
== dc->getParent()->isProtocolOrProtocolExtensionContext())&&
isProtocolSelfType(req.getFirstType())) {
break;
}
addConstraint(ConstraintKind::ConformsTo, subjectTy, proto,
locatorPtr);
} else {
auto boundTy = req.getSecondType().transform(replaceDependentTypes);
addConstraint(ConstraintKind::Subtype, subjectTy, boundTy, locatorPtr);
auto proto = req.getSecondType()->castTo<ProtocolType>();
// Determine whether this is the protocol 'Self' constraint we should
// skip.
if (skipProtocolSelfConstraint &&
(proto->getDecl() == dc->isProtocolOrProtocolExtensionContext() ||
proto->getDecl()
== dc->getParent()->isProtocolOrProtocolExtensionContext())&&
isProtocolSelfType(req.getFirstType())) {
break;
}
addConstraint(ConstraintKind::ConformsTo, subjectTy, proto,
locatorPtr);
break;
}
case RequirementKind::Superclass: {
auto subjectTy = req.getFirstType().transform(replaceDependentTypes);
auto boundTy = req.getSecondType().transform(replaceDependentTypes);
addConstraint(ConstraintKind::Subtype, subjectTy, boundTy, locatorPtr);
break;
}