From 92e0fd4daed3e6a6475c5f621fbf51f6f46a301d Mon Sep 17 00:00:00 2001
From: Holly Borla <hborla@apple.com>
Date: Tue, 16 Nov 2021 20:31:15 -0800
Subject: [PATCH] [ConstraintSystem] Extend the early type variable binding
 heuristic to builtin types.

---
 lib/Sema/CSBindings.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
index fedd00975d31e..a2783b9f9eceb 100644
--- 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() &&