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

Track the actual DC of a member access in the constraint system.

Browse Source 
Without this, CSGen/CSSimplify and CSApply may have differing
opinions about whether e.g. a let property is settable, which
can lead to invalid ASTs.

Arguably, a better fix would be to remove the dependency on the
exact nested DC.  For example, we could treat lets as settable
in all contexts and then just complain later about invalid
attempts to set them.  Or we could change CSApply to directly
use the information it already has about how an l-value is used,
rather than trying to figure out whether it *might* be getting set.
But somehow, tracking a new piece of information through the
entire constraint system seems to be the more minimal change.

Fixes rdar://29810997.
This commit is contained in:
John McCall
2017-01-26 00:14:21 -05:00
parent 6267f47959
commit 39b65f49a0
9 changed files with 243 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Sema/ConstraintSystem.cpp
View File

@@ -1021,7 +1021,7 @@ static bool isRequirementOrWitness(const ConstraintLocatorBuilder &locator) {
std::pair<Type, Type>
ConstraintSystem::getTypeOfMemberReference(
Type baseTy, ValueDecl *value,
Type baseTy, ValueDecl *value, DeclContext *useDC,
bool isTypeReference,
bool isDynamicResult,
FunctionRefKind functionRefKind,
@@ -1084,7 +1084,7 @@ ConstraintSystem::getTypeOfMemberReference(
locator, replacements, innerDC, outerDC,
/*skipProtocolSelfConstraint=*/true);
} else {
openedType = TC.getUnopenedTypeOfReference(value, baseTy, DC, base,
openedType = TC.getUnopenedTypeOfReference(value, baseTy, useDC, base,
/*wantInterfaceType=*/true);
// The type of 'Self' that will be added if the declaration
@@ -1251,13 +1251,14 @@ ConstraintSystem::getTypeOfMemberReference(
void ConstraintSystem::addOverloadSet(Type boundType,
ArrayRef<OverloadChoice> choices,
DeclContext *useDC,
ConstraintLocator *locator,
OverloadChoice *favoredChoice) {
assert(!choices.empty() && "Empty overload set");
// If there is a single choice, add the bind overload directly.
if (choices.size() == 1) {
addBindOverloadConstraint(boundType, choices.front(), locator);
addBindOverloadConstraint(boundType, choices.front(), locator, useDC);
return;
}
@@ -1270,6 +1271,7 @@ void ConstraintSystem::addOverloadSet(Type boundType,
Constraint::createBindOverload(*this,
boundType,
*favoredChoice,
useDC,
locator);
bindOverloadConstraint->setFavored();
@@ -1282,7 +1284,7 @@ void ConstraintSystem::addOverloadSet(Type boundType,
continue;
overloads.push_back(Constraint::createBindOverload(*this, boundType, choice,
locator));
useDC, locator));
}
addDisjunctionConstraint(overloads, locator, ForgetChoice, favoredChoice);
@@ -1363,7 +1365,8 @@ resolveOverloadForDeclWithSpecialTypeCheckingSemantics(ConstraintSystem &CS,
void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
Type boundType,
OverloadChoice choice) {
OverloadChoice choice,
DeclContext *useDC) {
// Determine the type to which we'll bind the overload set's type.
Type refType;
Type openedFullType;
@@ -1407,7 +1410,7 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
auto anchor = locator ? locator->getAnchor() : nullptr;
auto base = getDotBase(anchor);
std::tie(openedFullType, refType)
= getTypeOfMemberReference(baseTy, choice.getDecl(),
= getTypeOfMemberReference(baseTy, choice.getDecl(), useDC,
isTypeReference, isDynamicResult,
choice.getFunctionRefKind(),
locator, base, nullptr);