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

[ConstraintSystem] Limit new implicit conversion to only Double <-> CGFloat

Browse Source
This commit is contained in:
Pavel Yaskevich
2020-10-21 16:47:50 -07:00
parent b7fcae4822
commit 8c6017687a
8 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Sema/CSSimplify.cpp
View File

@@ -5089,9 +5089,14 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
}
}
auto isDoubleType = [&](NominalType *NTD) {
return NTD->getDecl() == getASTContext().getDoubleDecl();
};
if (kind >= ConstraintKind::Subtype &&
nominal1->getDecl() != nominal2->getDecl() &&
(desugar1->isCGFloatType() || desugar2->isCGFloatType())) {
((nominal1->isCGFloatType() || nominal2->isCGFloatType()) &&
(isDoubleType(nominal1) || isDoubleType(nominal2)))) {
SmallVector<LocatorPathElt, 4> path;
auto anchor = locator.getLocatorParts(path);
@@ -5112,15 +5117,15 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
if (auto elt =
rawElt.getAs<LocatorPathElt::ImplicitConversion>()) {
auto convKind = elt->getConversionKind();
return convKind == ConversionRestrictionKind::TypeToCGFloat ||
convKind == ConversionRestrictionKind::CGFloatToType;
return convKind == ConversionRestrictionKind::DoubleToCGFloat ||
convKind == ConversionRestrictionKind::CGFloatToDouble;
}
return false;
})) {
conversionsOrFixes.push_back(
desugar1->isCGFloatType()
? ConversionRestrictionKind::CGFloatToType
: ConversionRestrictionKind::TypeToCGFloat);
? ConversionRestrictionKind::CGFloatToDouble
: ConversionRestrictionKind::DoubleToCGFloat);
}
}
@@ -10523,8 +10528,8 @@ ConstraintSystem::simplifyRestrictedConstraintImpl(
ConstraintKind::Subtype, subflags, locator);
}
case ConversionRestrictionKind::TypeToCGFloat:
case ConversionRestrictionKind::CGFloatToType: {
case ConversionRestrictionKind::DoubleToCGFloat:
case ConversionRestrictionKind::CGFloatToDouble: {
increaseScore(SK_ImplicitValueConversion);
if (worseThanBestSolution())
return SolutionKind::Error;