[Diagnostics] NFC: Adjust test-cases improved by changes to closure expression handling

Author: xedin

test/Constraints/function_builder_diags.swift

@@ -211,7 +211,7 @@ func erroneousSR11350(x: Int) {
       if b {
         acceptInt(0) { }
       }
-    }).domap(0) // expected-error{{value of type 'Optional<()>' has no member 'domap'}}
+    }).domap(0) // expected-error{{value of type '()?' has no member 'domap'}}
   }
 }
 

test/Constraints/function_builder_one_way.swift

@@ -49,17 +49,17 @@ func tuplify<C: Collection, T>(_ collection: C, @TupleBuilder body: (C.Element)
 }
 
 // CHECK: ---Connected components---
-// CHECK-NEXT: 0: $T1 $T2 $T3 $T5 $T6 $T7 $T8 $T69 depends on 1
-// CHECK-NEXT: 1: $T9 $T11 $T16 $T30 $T62 $T63 $T64 $T65 $T66 $T67 $T68 depends on 2, 3, 4, 5
+// CHECK-NEXT: 0: $T1 $T2 $T3 $T5 $T6 $T7 $T8 $T10 $T11 $T69 depends on 1
+// CHECK-NEXT: 1: $T12 $T14 $T19 $T30 $T62 $T63 $T64 $T65 $T66 $T67 $T68 depends on 2, 3, 4, 5
 // CHECK-NEXT: 5: $T32 $T43 $T44 $T45 $T46 $T47 $T57 $T58 $T59 $T60 $T61 depends on 6, 9
 // CHECK-NEXT: 9: $T48 $T54 $T55 $T56 depends on 10
 // CHECK-NEXT: 10: $T49 $T50 $T51 $T52 $T53
 // CHECK-NEXT: 6: $T33 $T35 $T39 $T40 $T41 $T42 depends on 7, 8
 // CHECK-NEXT: 8: $T36 $T37 $T38
 // CHECK-NEXT: 7: $T34
-// CHECK-NEXT: 4: $T17 $T18 $T19 $T20 $T21 $T22 $T23 $T24 $T25 $T26 $T27 $T28 $T29
-// CHECK-NEXT: 3: $T14 $T15
-// CHECK-NEXT: 2: $T10
+// CHECK-NEXT: 4: $T20 $T21 $T22 $T23 $T24 $T25 $T26 $T27 $T28 $T29
+// CHECK-NEXT: 3: $T17 $T18
+// CHECK-NEXT: 2: $T13
 let names = ["Alice", "Bob", "Charlie"]
 let b = true
 var number = 17

test/Constraints/tuple_arguments.swift

@@ -1736,7 +1736,8 @@ func autoclosureSplat() {
   // wrap the closure in a function conversion.
 
   takeFn { (fn: @autoclosure () -> Int, x: Int) in }
-  // expected-error@-1 {{contextual closure type '(@escaping () -> Int) -> ()' expects 1 argument, but 2 were used in closure body}}
+  // expected-error@-1 {{contextual closure type '(() -> Int) -> ()' expects 1 argument, but 2 were used in closure body}}
+  // expected-error@-2 {{converting non-escaping value to 'T' may allow it to escape}}
 
   takeFn { (fn: @autoclosure @escaping () -> Int) in }
   // FIXME: It looks like matchFunctionTypes() does not check @autoclosure at all.

validation-test/Sema/type_checker_crashers_fixed/rdar50869732.swift

@@ -10,7 +10,8 @@ struct Generic<T> {
 
 @_functionBuilder
 struct Builder {
-  static func buildBlock<C0, C1>(_ c0: C0, _ c1: C1) // expected-note {{where 'C0' = 'Empty'}} expected-note {{where 'C1' = 'Test<Empty>'}}
+  static func buildBlock<C0, C1>(_ c0: C0, _ c1: C1) // expected-note 2 {{where 'C0' = 'Empty'}} expected-note {{where 'C1' = 'Test<Generic<(Empty, _)>>'}}
+  // expected-note@-1 {{'buildBlock' declared here}}
            -> Generic<(C0, C1)> where C0 : P, C1 : P {
     return Generic((c0, c1))
   }
@@ -24,13 +25,16 @@ struct Empty {
   init() {}
 }
 
-struct Test<T> where T : P { // expected-note {{where 'T' = 'Empty'}}
+struct Test<T> where T : P { // expected-note {{where 'T' = 'Generic<(Empty, _)>'}}
   init(@Builder _: () -> T) {}
 }
 
 let x = G {
   // expected-error@-1 {{static method 'buildBlock' requires that 'Empty' conform to 'P'}}
-  // expected-error@-2 {{static method 'buildBlock' requires that 'Test<Empty>' conform to 'P'}}
+  // expected-error@-2 {{static method 'buildBlock' requires that 'Test<Generic<(Empty, _)>>' conform to 'P'}}
   Empty()
-  Test { Empty() } // expected-error {{generic struct 'Test' requires that 'Empty' conform to 'P'}}
+  Test { Empty() }
+  // expected-error@-1 {{static method 'buildBlock' requires that 'Empty' conform to 'P'}}
+  // expected-error@-2 {{missing argument for parameter #2 in call}}
+  // expected-error@-3 {{generic struct 'Test' requires that 'Generic<(Empty, _)>' conform to 'P'}}
 }