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

Merge pull request #33272 from xedin/rdar-65254452

Browse Source 
[Diagnostics] Do more checking before recording `force downcast` fix
This commit is contained in:
Pavel Yaskevich
2020-08-04 10:22:47 -07:00
committed by GitHub
parent 857dce953a b47698bd54
commit 9b33ffa828
4 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/CSSimplify.cpp
View File

@@ -2968,6 +2968,9 @@ static bool
repairViaBridgingCast(ConstraintSystem &cs, Type fromType, Type toType,
SmallVectorImpl<RestrictionOrFix> &conversionsOrFixes,
ConstraintLocatorBuilder locator) {
if (fromType->hasTypeVariable() || toType->hasTypeVariable())
return false;
auto objectType1 = fromType->getOptionalObjectType();
auto objectType2 = toType->getOptionalObjectType();
@@ -2986,6 +2989,9 @@ repairViaBridgingCast(ConstraintSystem &cs, Type fromType, Type toType,
if (!canBridgeThroughCast(cs, fromType, toType))
return false;
if (!TypeChecker::checkedCastMaySucceed(fromType, toType, cs.DC))
return false;
conversionsOrFixes.push_back(ForceDowncast::create(
cs, fromType, toType, cs.getConstraintLocator(locator)));
return true;