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

Make the rvalue-as-lvalue fix symmetric for bind constraints, which causes another set of assignment errors to be discovered in

Browse Source 
the CS and slightly reduces the code in CSDiag.
This commit is contained in:
gregomni
2018-08-27 06:59:26 -07:00
parent 6e16e29aa1
commit 13d02bb85c
8 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Sema/CSSimplify.cpp
View File

@@ -2369,7 +2369,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
// If we're converting an lvalue to an inout type, add the missing '&'.
conversionsOrFixes.push_back(
AddAddressOf::create(*this, getConstraintLocator(locator)));
} else if (!isTypeVarOrMember1) {
} else {
// If we have a concrete type that's an rvalue, "fix" it.
conversionsOrFixes.push_back(
TreatRValueAsLValue::create(*this, getConstraintLocator(locator)));
@@ -2377,8 +2377,11 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
}
}
if (attemptFixes && type2->is<LValueType>() && !isTypeVarOrMember1) {
conversionsOrFixes.push_back(
if (attemptFixes && type2->is<LValueType>()) {
conversionsOrFixes.push_back(
TreatRValueAsLValue::create(*this, getConstraintLocator(locator)));
} else if (attemptFixes && kind == ConstraintKind::Bind && type1->is<LValueType>()) {
conversionsOrFixes.push_back(
TreatRValueAsLValue::create(*this, getConstraintLocator(locator)));
}
@@ -5008,7 +5011,11 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
}
case FixKind::TreatRValueAsLValue: {
auto result = matchTypes(LValueType::get(type1), type2,
if (type2->is<LValueType>() || type2->is<InOutType>())
type1 = LValueType::get(type1);
else
type2 = LValueType::get(type2);
auto result = matchTypes(type1, type2,
matchKind, subflags, locator);
if (result == SolutionKind::Solved)
if (recordFix(fix))