Revert "[CSBindings] Adjust hasConversions to handle Void has having not conversions"

xedin · xedin · commit c7fb93d99e7d · 2024-12-19T14:36:58.000-08:00
This reverts commit 76f0bcb. (cherry picked from commit ffac97a)
diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
@@ -1264,8 +1264,7 @@ static bool hasConversions(Type type) {
   }
 
   return !(type->is<StructType>() || type->is<EnumType>() ||
-           type->is<BuiltinType>() || type->is<ArchetypeType>() ||
-           type->isVoid());
+           type->is<BuiltinType>() || type->is<ArchetypeType>());
 }
 
 bool BindingSet::favoredOverDisjunction(Constraint *disjunction) const {

Original file line number	Diff line number	Diff line change
`@@ -1264,8 +1264,7 @@ static bool hasConversions(Type type) {`
`1264`	`1264`	`}`
`1265`	`1265`
`1266`	`1266`	`return !(type->is<StructType>() \|\| type->is<EnumType>() \|\|`
`1267`		`- type->is<BuiltinType>() \|\| type->is<ArchetypeType>() \|\|`
`1268`		`- type->isVoid());`
	`1267`	`+ type->is<BuiltinType>() \|\| type->is<ArchetypeType>());`
`1269`	`1268`	`}`
`1270`	`1269`
`1271`	`1270`	`bool BindingSet::favoredOverDisjunction(Constraint *disjunction) const {`