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

[ConstraintSystem] Extend metatype instance type mismatch coverage

Browse Source 
Originally type mismatches associated with metatypes were only covered
for coercions but fix coverage grew since then and now it makes sense
to remove special case and let `repairFailures` take care of it.
This commit is contained in:
Pavel Yaskevich
2020-01-29 09:40:38 -08:00
parent ffa6bf4729
commit 3fff5dd064
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Sema/CSSimplify.cpp
View File

@@ -4068,16 +4068,12 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
auto result =
matchTypes(instanceType1, instanceType2, subKind, subflags,
locator.withPathElement(ConstraintLocator::InstanceType));
if (shouldAttemptFixes() && result.isFailure()) {
auto *anchor = locator.getAnchor();
if (anchor && isa<CoerceExpr>(anchor)) {
auto *fix =
ContextualMismatch::create(*this, instanceType1, instanceType2,
getConstraintLocator(locator));
conversionsOrFixes.push_back(fix);
break;
}
}
// If matching of the instance types resulted in the failure make sure
// to give `repairFailure` a chance to run to attempt to fix the issue.
if (shouldAttemptFixes() && result.isFailure())
break;
return result;
}