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] Record all Double <-> CGFloat conversions performed along a current solver path

Browse Source 
This information makes it easier to compute a score for the next
implicit value conversion solver would have to perform.
This commit is contained in:
Pavel Yaskevich
2020-11-15 20:01:13 -08:00
parent e6bdb60075
commit c77d0862bb
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Sema/CSSimplify.cpp
View File

@@ -5083,14 +5083,10 @@ 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() &&
((nominal1->isCGFloatType() || nominal2->isCGFloatType()) &&
(isDoubleType(nominal1) || isDoubleType(nominal2)))) {
(nominal1->isDoubleType() || nominal2->isDoubleType()))) {
SmallVector<LocatorPathElt, 4> path;
auto anchor = locator.getLocatorParts(path);
@@ -10531,7 +10527,7 @@ ConstraintSystem::simplifyRestrictedConstraintImpl(
auto defaultImpact =
restriction == ConversionRestrictionKind::CGFloatToDouble ? 1 : 2;
auto numConversions = CurrentScore.Data[SK_ImplicitValueConversion];
auto numConversions = ImplicitValueConversions.size();
increaseScore(SK_ImplicitValueConversion,
defaultImpact * (numConversions + 1));
@@ -10572,6 +10568,9 @@ ConstraintSystem::simplifyRestrictedConstraintImpl(
addConstraint(ConstraintKind::ApplicableFunction,
FunctionType::get({FunctionType::Param(type1)}, type2),
memberTy, applicationLoc);
ImplicitValueConversions.push_back(
{getConstraintLocator(locator), restriction});
return SolutionKind::Solved;
}
}