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

[CS] Use subclasses to expose locator element info

Browse Source 
Instead of adding specific accessors directly to
ConstraintLocator::PathElement, add subclasses that expose these
accessors.
This commit is contained in:
Hamish Knight
2019-08-10 18:10:23 +01:00
parent 258d05aab8
commit a0919f73b0
12 changed files with 484 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Sema/ConstraintSystem.cpp
View File

@@ -1089,8 +1089,8 @@ void ConstraintSystem::openGenericParameters(DeclContext *outerDC,
// Create the type variables for the generic parameters.
for (auto gp : sig->getGenericParams()) {
auto *paramLocator =
getConstraintLocator(locator.withPathElement(LocatorPathElt(gp)));
auto *paramLocator = getConstraintLocator(
locator.withPathElement(LocatorPathElt::GenericParameter(gp)));
auto typeVar = createTypeVariable(paramLocator, TVO_PrefersSubtypeBinding);
auto result = replacements.insert(std::make_pair(
@@ -1101,7 +1101,7 @@ void ConstraintSystem::openGenericParameters(DeclContext *outerDC,
}
auto *baseLocator = getConstraintLocator(
locator.withPathElement(LocatorPathElt::getOpenedGeneric(sig)));
locator.withPathElement(LocatorPathElt::OpenedGeneric(sig)));
bindArchetypesFromContext(*this, outerDC, baseLocator, replacements);
}
@@ -1141,9 +1141,9 @@ void ConstraintSystem::openGenericRequirements(
addConstraint(
*openedReq,
locator.withPathElement(LocatorPathElt::getOpenedGeneric(signature))
locator.withPathElement(LocatorPathElt::OpenedGeneric(signature))
.withPathElement(
LocatorPathElt::getTypeRequirementComponent(pos, kind)));
LocatorPathElt::TypeParameterRequirement(pos, kind)));
}
}
@@ -1746,7 +1746,7 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
addConstraint(ConstraintKind::ConformsTo, argType,
hashable->getDeclaredType(),
getConstraintLocator(
locator, LocatorPathElt::getTupleElement(index)));
locator, LocatorPathElt::TupleElement(index)));
}
};
@@ -1959,7 +1959,7 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
"parameter is supposed to be a keypath");
auto *keyPathLoc = getConstraintLocator(
locator, LocatorPathElt::getKeyPathDynamicMember(keyPathDecl));
locator, LocatorPathElt::KeyPathDynamicMember(keyPathDecl));
auto rootTy = keyPathTy->getGenericArgs()[0];
auto leafTy = keyPathTy->getGenericArgs()[1];