Update test cherry-picked from master

Author: DougGregor

test/Constraints/function_builder_diags.swift

@@ -144,7 +144,7 @@ struct TupleP<U> : P {
 
 @_functionBuilder
 struct Builder {
-  static func buildBlock<S0, S1>(_ stmt1: S0, _ stmt2: S1) // expected-note {{where 'S1' = 'Label<Any>.Type'}}
+  static func buildBlock<S0, S1>(_ stmt1: S0, _ stmt2: S1)
            -> TupleP<(S0, S1)> where S0: P, S1: P {
     return TupleP((stmt1, stmt2))
   }
@@ -166,7 +166,7 @@ struct Label<L> : P where L : P { // expected-note {{'L' declared as parameter t
 }
 
 func test_51167632() -> some P {
-  AnyP(G { // expected-error {{static method 'buildBlock' requires that 'Label<Any>.Type' conform to 'P'}}
+  AnyP(G {
     Text("hello")
     Label  // expected-error {{generic parameter 'L' could not be inferred}}
     // expected-note@-1 {{explicitly specify the generic arguments to fix this issue}} {{10-10=<<#L: P#>>}}

test/decl/var/function_builders.swift

@@ -27,23 +27,18 @@ var globalWithEmptyImplicitGetter: Int {}
 // FIXME: extra diagnostics
 @Maker
 var globalWithEmptyExplicitGetter: Int { get {} }  // expected-error{{type 'Maker' has no member 'buildBlock'}}
-// expected-error@-1 {{cannot convert return expression of type 'Any' to return type 'Int'}}
 
 @Maker
 var globalWithSingleGetter: Int { 0 } // expected-error {{ype 'Maker' has no member 'buildBlock'}}
-// expected-error@-1 {{cannot convert return expression of type 'Any' to return type 'Int'}}
 
 @Maker
 var globalWithMultiGetter: Int { 0; 0 } // expected-error {{ype 'Maker' has no member 'buildBlock'}}
-// expected-error@-1 {{cannot convert return expression of type 'Any' to return type 'Int'}}
 
 @Maker
 func globalFunction() {} // expected-error {{ype 'Maker' has no member 'buildBlock'}}
-// expected-error@-1 {{unexpected non-void return value in void function}}
 
 @Maker
 func globalFunctionWithFunctionParam(fn: () -> ()) {}  // expected-error {{ype 'Maker' has no member 'buildBlock'}}
-// expected-error@-1 {{unexpected non-void return value in void function}}
 
 func makerParam(@Maker
                 fn: () -> ()) {}