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

[tests] Adjusting SR-12869 test cases for optional mismatches

Browse Source
This commit is contained in:
Luciano Almeida
2020-05-24 16:09:19 -03:00
parent 086ad339c9
commit 2e1609e533
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Sema/CSSimplify.cpp
View File

@@ -3367,8 +3367,7 @@ bool ConstraintSystem::repairFailures(
conversionsOrFixes.push_back(
IgnoreAssignmentDestinationType::create(*this, lhs, rhs, loc));
} else {
conversionsOrFixes.push_back(
TreatRValueAsLValue::create(*this, loc));
conversionsOrFixes.push_back(TreatRValueAsLValue::create(*this, loc));
}
return true;
@@ -8876,11 +8875,11 @@ ConstraintSystem::simplifyRestrictedConstraintImpl(
// tuple mismatch.
if (hasFixFor(loc, FixKind::AllowTupleTypeMismatch))
return true;
if (restriction == ConversionRestrictionKind::ValueToOptional ||
restriction == ConversionRestrictionKind::OptionalToOptional)
++impact;
auto *fix =
loc->isLastElement<LocatorPathElt::ApplyArgToParam>()
? AllowArgumentMismatch::create(*this, fromType, toType, loc)