Merge remote-tracking branch 'origin/swift-4.0-branch' into stable
diff --git a/test/CodeGen/ubsan-null.c b/test/CodeGen/ubsan-null.c
index 6ddae8a..2b7cd3e 100644
--- a/test/CodeGen/ubsan-null.c
+++ b/test/CodeGen/ubsan-null.c
@@ -12,12 +12,3 @@
 // CHECK-SAME: getelementptr inbounds (%struct.A, %struct.A* null, i32 0, i32 1)
   return &((struct A *)0)->b;
 }
-
-// CHECK-LABEL: @f2
-int f2() {
-// CHECK: __ubsan_handle_type_mismatch
-// CHECK: load
-// CHECK-SAME: getelementptr inbounds (%struct.A, %struct.A* null, i32 0, i32 1)
-// CHECK: ret
-  return ((struct A *)0)->b;
-}