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

Fixing test on test/Generics/conditional_conformances.swift

Browse Source
This commit is contained in:
Luciano Almeida
2019-10-12 18:20:23 -03:00
parent 05cea3a7b7
commit 697b407589
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Sema/CSSimplify.cpp
View File

@@ -2405,6 +2405,16 @@ bool ConstraintSystem::repairFailures(
SmallVector<LocatorPathElt, 4> path;
auto *anchor = locator.getLocatorParts(path);
// If we have a coerce expr, attempt to repair with a `CoerceToCheckedCastFix`.
auto repairByCoerceToCheckedCast = [&](Type fromType, Type toYype) -> bool {
if (auto *coerceToCheckCastFix =
CoerceToCheckedCast::attempt(*this, lhs, rhs, getConstraintLocator(locator))) {
conversionsOrFixes.push_back(coerceToCheckCastFix);
return true;
}
return false;
};
// If there is a missing explicit call it could be:
//
// a). Contextual e.g. `let _: R = foo`
@@ -2520,12 +2530,10 @@ bool ConstraintSystem::repairFailures(
if (path.empty()) {
if (!anchor)
return false;
if (auto *coerceToCheckCastFix =
CoerceToCheckedCast::attempt(*this, lhs, rhs, getConstraintLocator(locator))) {
conversionsOrFixes.push_back(coerceToCheckCastFix);
// Repair a coercion ('as') with a forced checked cast ('as!').
if (repairByCoerceToCheckedCast(lhs, rhs))
return true;
}
// This could be:
// - `InOutExpr` used with r-value e.g. `foo(&x)` where `x` is a `let`.