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() &&