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

Move another chunk of lvalue diagnostics over to being handled via ConstraintFix.

Browse Source
This commit is contained in:
gregomni
2018-08-19 13:14:55 -07:00
parent aeb96274d2
commit 19fce5d36f
5 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Sema/CSSimplify.cpp
View File

@@ -2450,6 +2450,11 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
TreatRValueAsLValue::create(*this, getConstraintLocator(locator)));
}
}
if (type2->is<LValueType>() && !isTypeVarOrMember1) {
conversionsOrFixes.push_back(
TreatRValueAsLValue::create(*this, getConstraintLocator(locator)));
}
}
if (conversionsOrFixes.empty()) {
@@ -4659,11 +4664,11 @@ ConstraintSystem::simplifyRestrictedConstraintImpl(
addContextualScore();
// Unwrap an inout type.
auto obj1 = type1->getInOutObjectType();
obj1 = getFixedTypeRecursive(obj1, false, false);
auto t2 = type2->getDesugaredType();
auto baseType1 = getFixedTypeRecursive(*isArrayType(obj1), false, false);
auto baseType2 = getBaseTypeForPointer(*this, t2);