diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
index 2f9a971ab60ec..9631434dc206d 100644
--- a/lib/Sema/CSBindings.cpp
+++ b/lib/Sema/CSBindings.cpp
@@ -1269,7 +1269,8 @@ static bool hasConversions(Type type) {
   }
 
   return !(type->is<StructType>() || type->is<EnumType>() ||
-           type->is<BuiltinType>() || type->is<ArchetypeType>());
+           type->is<BuiltinType>() || type->is<ArchetypeType>() ||
+           type->isVoid());
 }
 
 bool BindingSet::favoredOverDisjunction(Constraint *disjunction) const {