Merge pull request #15448 from rudkx/make-type-join-more-resilient

Add support for Builtin types to Type::join.

Author: rudkx

lib/AST/TypeJoinMeet.cpp

@@ -73,9 +73,10 @@ struct TypeJoin : CanTypeVisitor<TypeJoin, CanType> {
   CanType visitProtocolCompositionType(CanType second);
   CanType visitLValueType(CanType second);
   CanType visitInOutType(CanType second);
+  CanType visitBuiltinType(CanType second);
 
   CanType visitType(CanType second) {
-    llvm_unreachable("Unimplemented type visitor!");
+    return Unimplemented;
   }
 
 public:
@@ -368,6 +369,13 @@ CanType TypeJoin::visitLValueType(CanType second) { return Unimplemented; }
 
 CanType TypeJoin::visitInOutType(CanType second) { return Unimplemented; }
 
+CanType TypeJoin::visitBuiltinType(CanType second) {
+  assert(First != second);
+
+  // BuiltinType with any non-equal type results in Any.
+  return TheAnyType;
+}
+
 } // namespace
 
 Optional<Type> Type::join(Type first, Type second) {

test/Sema/type_join.swift

@@ -34,6 +34,10 @@ expectEqualType(Builtin.type_join(D?.self, Any.self), Any?.self)
 expectEqualType(Builtin.type_join(Any?.self, Any.self), Any?.self)
 expectEqualType(Builtin.type_join(Any.self, Any?.self), Any?.self)
 
+expectEqualType(Builtin.type_join(Builtin.Int1.self, Builtin.Int1.self), Builtin.Int1.self)
+expectEqualType(Builtin.type_join(Builtin.Int32.self, Builtin.Int1.self), Any.self)
+expectEqualType(Builtin.type_join(Builtin.Int1.self, Builtin.Int32.self), Any.self)
+
 func joinFunctions(
   _ escaping: @escaping () -> (),
   _ nonescaping: () -> ()