Merge pull request #40217 from hborla/early-bind-builtin-types

hborla · web-flow · commit 1ca3b93d7357 · 2021-11-17T09:16:15.000-08:00
[ConstraintSystem] Extend the early type variable binding heuristic to builtin types.
diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
@@ -1010,7 +1010,8 @@ bool BindingSet::favoredOverDisjunction(Constraint *disjunction) const {
           }
         }
 
-        return type->is<StructType>() || type->is<EnumType>();
+        return type->is<StructType>() || type->is<EnumType>() ||
+               type->is<BuiltinType>();
       })) {
     // Result type of subscript could be l-value so we can't bind it early.
     if (!TypeVar->getImpl().isSubscriptResultType() &&

Original file line number	Diff line number	Diff line change
`@@ -1010,7 +1010,8 @@ bool BindingSet::favoredOverDisjunction(Constraint *disjunction) const {`
`1010`	`1010`	`}`
`1011`	`1011`	`}`
`1012`	`1012`
`1013`		`- return type->is<StructType>() \|\| type->is<EnumType>();`
	`1013`	`+ return type->is<StructType>() \|\| type->is<EnumType>() \|\|`
	`1014`	`+ type->is<BuiltinType>();`
`1014`	`1015`	`})) {`
`1015`	`1016`	`// Result type of subscript could be l-value so we can't bind it early.`
`1016`	`1017`	`if (!TypeVar->getImpl().isSubscriptResultType() &&`