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

Conflict resolution and conversion to ConstraintFix class

Browse Source
This commit is contained in:
gregomni
2018-08-16 18:21:43 -07:00
parent 9e0dae513c
commit eaf8c6d232
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/CSSimplify.cpp
View File

@@ -2446,7 +2446,8 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
AddAddressOf::create(*this, getConstraintLocator(locator)));
} else if (!isTypeVarOrMember1) {
// If we have a concrete type that's an rvalue, "fix" it.
conversionsOrFixes.push_back(FixKind::TreatRValueAsLValue);
conversionsOrFixes.push_back(
TreatRValueAsLValue::create(*this, getConstraintLocator(locator)));
}
}
}
@@ -4990,7 +4991,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
auto result = matchTypes(LValueType::get(type1), type2,
matchKind, subflags, locator);
if (result == SolutionKind::Solved)
if (recordFix(fix, locator))
if (recordFix(fix))
return SolutionKind::Error;
return result;