[CSBindings] Don't attempt to bind type variables early if the conversion

hborla · xedin · commit 020c29b34704 · 2021-11-08T13:51:23.000-08:00
type is CGFloat or Double, and minimize the diagnostic impact of this
heuristic by only binding early for valid code.
diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
@@ -990,7 +990,10 @@ bool BindingSet::favoredOverDisjunction(Constraint *disjunction) const {
 
         auto type = binding.BindingType;
 
-        if (type->isAnyHashable())
+        if (CS.shouldAttemptFixes())
+          return false;
+
+        if (type->isAnyHashable() || type->isDouble() || type->isCGFloatType())
           return false;
 
         {

Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,10 @@ bool BindingSet::favoredOverDisjunction(Constraint *disjunction) const {`
`990`	`990`
`991`	`991`	`auto type = binding.BindingType;`
`992`	`992`
`993`		`- if (type->isAnyHashable())`
	`993`	`+ if (CS.shouldAttemptFixes())`
	`994`	`+ return false;`
	`995`	`+`
	`996`	`+ if (type->isAnyHashable() \|\| type->isDouble() \|\| type->isCGFloatType())`
`994`	`997`	`return false;`
`995`	`998`
`996`	`999`	`{`