[TypeChecker] Enable result builder AST transform by default

Author: xedin

include/swift/Basic/Features.def

@@ -84,6 +84,7 @@ LANGUAGE_FEATURE(BuiltinCopy, 0, "Builtin.copy()", true)
 LANGUAGE_FEATURE(BuiltinStackAlloc, 0, "Builtin.stackAlloc", true)
 LANGUAGE_FEATURE(BuiltinTaskRunInline, 0, "Builtin.taskRunInline", true)
 LANGUAGE_FEATURE(BuiltinUnprotectedAddressOf, 0, "Builtin.unprotectedAddressOf", true)
+LANGUAGE_FEATURE(ResultBuilderASTTransform, 0, "result builders as AST transform", true)
 SUPPRESSIBLE_LANGUAGE_FEATURE(SpecializeAttributeWithAvailability, 0, "@_specialize attribute with availability", true)
 LANGUAGE_FEATURE(BuiltinAssumeAlignment, 0, "Builtin.assumeAlignment", true)
 SUPPRESSIBLE_LANGUAGE_FEATURE(UnsafeInheritExecutor, 0, "@_unsafeInheritExecutor", true)
@@ -104,7 +105,6 @@ EXPERIMENTAL_FEATURE(FlowSensitiveConcurrencyCaptures, false)
 EXPERIMENTAL_FEATURE(MoveOnly, false)
 EXPERIMENTAL_FEATURE(OneWayClosureParameters, false)
 EXPERIMENTAL_FEATURE(TypeWitnessSystemInference, false)
-EXPERIMENTAL_FEATURE(ResultBuilderASTTransform, true)
 EXPERIMENTAL_FEATURE(LayoutPrespecialization, false)
 EXPERIMENTAL_FEATURE(ModuleInterfaceExportAs, true)
 

lib/Frontend/CompilerInvocation.cpp

@@ -708,6 +708,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_enable_experimental_opaque_type_erasure))
     Opts.Features.insert(Feature::OpaqueTypeErasure);
 
+  Opts.Features.insert(Feature::ResultBuilderASTTransform);
+
   Opts.EnableAppExtensionRestrictions |= Args.hasArg(OPT_enable_app_extension);
 
   Opts.EnableSwift3ObjCInference =

test/Constraints/result_builder_diags.swift

@@ -78,7 +78,7 @@ struct TupleBuilderWithoutIf { // expected-note 3{{struct 'TupleBuilderWithoutIf
   static func buildDo<T>(_ value: T) -> T { return value }
 }
 
-func tuplify<T>(_ cond: Bool, @TupleBuilder body: (Bool) -> T) { // expected-note {{in call to function 'tuplify(_:body:)'}}
+func tuplify<T>(_ cond: Bool, @TupleBuilder body: (Bool) -> T) {
   print(body(cond))
 }
 
@@ -194,7 +194,7 @@ struct TupleP<U> : P {
 
 @resultBuilder
 struct Builder {
-  static func buildBlock<S0, S1>(_ stmt1: S0, _ stmt2: S1) // expected-note {{required by static method 'buildBlock' where 'S1' = 'Label<_>.Type'}}
+  static func buildBlock<S0, S1>(_ stmt1: S0, _ stmt2: S1)
            -> TupleP<(S0, S1)> where S0: P, S1: P {
     return TupleP((stmt1, stmt2))
   }
@@ -216,7 +216,7 @@ struct Label<L> : P where L : P { // expected-note 2 {{'L' declared as parameter
 }
 
 func test_51167632() -> some P {
-  AnyP(G { // expected-error {{type 'Label<_>.Type' cannot conform to 'P'}} expected-note {{only concrete types such as structs, enums and classes can conform to protocols}}
+  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#>>}}
@@ -509,7 +509,7 @@ enum E3 {
 }
 
 func testCaseMutabilityMismatches(e: E3) {
-   tuplify(true) { c in // expected-error {{generic parameter 'T' could not be inferred}}
+   tuplify(true) { c in
     "testSwitch"
     switch e {
     case .a(let x, var y),
@@ -527,12 +527,13 @@ func testCaseMutabilityMismatches(e: E3) {
 
 // Check for type equivalence among different case variables with the same name.
 func testCaseVarTypes(e: E3) {
-    // FIXME: Terrible diagnostic
-    tuplify(true) { c in  // expected-error{{type of expression is ambiguous without more context}}
+    tuplify(true) { c in
     "testSwitch"
     switch e {
     case .a(let x, let y),
          .c(let x, let y):
+         // expected-error@-1 {{pattern variable bound to type 'String', expected type 'Int'}}
+         // expected-error@-2 {{pattern variable bound to type 'Int', expected type 'String'}}
       x
       y + "a"
     }
@@ -659,14 +660,16 @@ struct MyView {
   }
 
   @TupleBuilder var invalidCaseWithoutDot: some P {
+  // expected-error@-1 {{return type of property 'invalidCaseWithoutDot' requires that 'Either<Int, Int>' conform to 'P'}}
+  // expected-note@-2 {{opaque return type declared here}}
     switch Optional.some(1) {
     case none: 42 // expected-error {{cannot find 'none' in scope}}
     case .some(let x):
       0
     }
   }
 
-  @TupleBuilder var invalidConversion: Int { // expected-error {{cannot convert value of type 'String' to specified type 'Int'}}
+  @TupleBuilder var invalidConversion: Int { // expected-error {{cannot convert return expression of type 'String' to return type 'Int'}}
     ""
   }
 }
@@ -684,7 +687,7 @@ do {
 }
 
 struct TuplifiedStructWithInvalidClosure {
-  var condition: Bool
+  var condition: Bool?
 
   @TupleBuilder var unknownParameter: some Any {
     if let cond = condition {
@@ -697,7 +700,7 @@ struct TuplifiedStructWithInvalidClosure {
   }
 
   @TupleBuilder var unknownResult: some Any {
-    if let cond = condition {
+    if let _ = condition {
       let _ = { () -> UnknownType in // expected-error {{cannot find type 'UnknownType' in scope}}
       }
       42
@@ -707,7 +710,7 @@ struct TuplifiedStructWithInvalidClosure {
   }
 
   @TupleBuilder var multipleLevelsDeep: some Any {
-    if let cond = condition {
+    if let _ = condition {
       switch MyError.boom {
       case .boom:
         let _ = { () -> UnknownType in // expected-error {{cannot find type 'UnknownType' in scope}}
@@ -721,7 +724,7 @@ struct TuplifiedStructWithInvalidClosure {
   }
 
   @TupleBuilder var errorsDiagnosedByParser: some Any {
-    if let cond = condition {
+    if let _ = condition {
       tuplify { _ in
         self. // expected-error {{expected member name following '.'}}
       }
@@ -759,9 +762,10 @@ func test_rdar65667992() {
     var entry: E
 
     @Builder var body: S {
-      switch entry { // expected-error {{type 'E' has no member 'unset'}}
+      switch entry {
       case .set(_, _): S()
-      case .unset(_): S() // expected-error {{'_' can only appear in a pattern or on the left side of an assignment}}
+      case .unset(_): S() // expected-error {{type 'E' has no member 'unset'}}
+      // expected-error@-1 {{'_' can only appear in a pattern or on the left side of an assignment}}
       default: S()
       }
     }
@@ -796,7 +800,9 @@ func test_missing_member_in_optional_context() {
     if let prop = test?.prop { // expected-error {{value of type 'Test' has no member 'prop'}}
       0
     }
+  }
 
+  tuplify(true) { c in
     if let method = test?.method() { // expected-error {{value of type 'Test' has no member 'method'}}
       1
     }
@@ -850,10 +856,10 @@ func test_invalid_result_is_diagnosed() {
     }
   }
 
-  struct S<T> {} // expected-note {{arguments to generic parameter 'T' ('Int' and 'String') are expected to be equal}}
+  struct S<T> {}
 
   @MyBuilder
-  func test() -> S<String> { // expected-error {{cannot convert result builder result type 'S<Int>' to return type 'S<String>}}
+  func test() -> S<String> { // expected-error {{conflicting arguments to generic parameter 'T1' ('S<Int>' vs. 'S<String>')}}
     S<Int>()
   }
 }
@@ -887,6 +893,15 @@ func test_associated_values_dont_block_solver_when_unresolved() {
       // expected-note@-1 {{chain the optional using '?' to access member 'kind' only for non-'nil' base values}}
       // expected-note@-2 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
 
+      switch v.kind {
+      case .a(_): "a"
+      case .b: "b"
+      }
+    }
+
+    @Builder var switchError: String {
+      let v = container.prop!.kind
+
       switch v.kind { // expected-error {{value of type 'Value.Kind' has no member 'kind'}}
       case .a(_): "a"
       case .b: "b"

test/Constraints/result_builder_one_way.swift

@@ -36,7 +36,7 @@ func testGlobalLookup() {
   @TupleBuilder<String> var x1 {
     #^GLOBAL_LOOKUP^#
     // GLOBAL_LOOKUP: Begin completions
-    // GLOBAL_LOOKUP: Decl[GlobalVar]/CurrModule/TypeRelation[Convertible]:         MyConstantString[#String#];
+    // GLOBAL_LOOKUP: Decl[GlobalVar]/CurrModule/TypeRelation[Convertible]:         MyConstantString[#String#]; name=MyConstantString
     // GLOBAL_LOOKUP: End completions
   }
 
@@ -81,6 +81,8 @@ func testStaticMemberLookup() {
   @TupleBuilder<String> var x1 {
     StringFactory.#^COMPLETE_STATIC_MEMBER^#
     // COMPLETE_STATIC_MEMBER: Begin completions
+    // COMPLETE_STATIC_MEMBER: Keyword[self]/CurrNominal:          self[#StringFactory.Type#]; name=self
+    // COMPLETE_STATIC_MEMBER: Keyword/CurrNominal:                Type[#StringFactory.Type#]; name=Type
     // COMPLETE_STATIC_MEMBER: Decl[StaticMethod]/CurrNominal/TypeRelation[Convertible]:     makeString({#x: String#})[#String#];
     // COMPLETE_STATIC_MEMBER: End completions
   }

test/IDE/complete_in_result_builder.swift

@@ -86,7 +86,7 @@ class TestResultBuilder {
     // CHECK:              closure_expr type='() -> ConcreteP'
     takesBuilder {
       // CHECK: return_stmt
-      // CHECK-NEXT: load_expr implicit type='ConcreteP'
+      // CHECK-NEXT: call_expr implicit type='ConcreteP'
       ConcreteP()
     }
   }

test/Sema/type_eraser.swift

@@ -3,14 +3,11 @@
 import RegexBuilder
 
 extension Regex where Output == Substring {
-  init(_ x: String) {} // expected-note {{'init(_:)' declared here}}
+  init(_ x: String) {}
 }
 
 func foo() {
-  // FIXME: This diagnostic could probably be better, it's not clear we should
-  // be resolving to init(_ x: String) vs the result builder API and diagnosing
-  // the fact that Int isn't a RegexComponent.
-  _ = Regex { // expected-error {{trailing closure passed to parameter of type 'String' that does not accept a closure}}
-    0
+  _ = Regex {
+    0 // expected-error {{static method 'buildExpression' requires that 'Int' conform to 'RegexComponent'}}
   }
 }

test/StringProcessing/Sema/regex_builder_already_imported.swift

@@ -72,6 +72,6 @@ struct SplitView: View2 {
 }
 
 // COMPLETE: Begin completions
-// COMPLETE-DAG: Decl[InstanceMethod]/Super:         frame()[#Never#]; name=frame()
-// COMPLETE-DAG: Decl[InstanceMethod]/Super:         frame({#width: Int?#}, {#height: Int?#})[#Never#]; name=frame(width:height:)
+// COMPLETE-DAG: Decl[InstanceMethod]/Super/TypeRelation[Convertible]: frame()[#Never#]; name=frame()
+// COMPLETE-DAG: Decl[InstanceMethod]/Super/TypeRelation[Convertible]: frame({#width: Int?#}, {#height: Int?#})[#Never#]; name=frame(width:height:)
 // COMPLETE: End completions

validation-test/IDE/issues_fixed/issue-57041.swift

@@ -16,7 +16,6 @@ struct ContentView: View {
       DatePicker("Enter a date", selection: $date, displayedComponents: .date, in: Date())
       // expected-error@-1 {{argument 'in' must precede argument 'displayedComponents'}} {{78-90=}} {{52-52=in: Date(), }}
       DatePicker("Enter a date", selection: $date, displayedComponents: .date, in: Date() ... Date().addingTimeInterval(100))
-      // expected-error@-1 {{argument 'in' must precede argument 'displayedComponents'}} {{78-125=}} {{52-52=in: Date() ... Date().addingTimeInterval(100), }}
     }
   }
 }

validation-test/Sema/SwiftUI/issue-56479.swift

@@ -9,10 +9,13 @@ import SwiftUI
 
 struct Experiment: View {
   var body: some View {
-    HStack { // expected-error {{generic parameter 'Content' could not be inferred}} expected-note {{explicitly specify the generic arguments to fix this issue}}emacs
+    HStack {
       Slider(value: <#T##Binding<BinaryFloatingPoint>#>, in: <#T##ClosedRange<BinaryFloatingPoint>#>, label: <#T##() -> _#>) // expected-error 3 {{editor placeholder in source file}}
       // expected-error@-1 {{type 'any BinaryFloatingPoint' cannot conform to 'Comparable'}}
       // expected-note@-2 {{only concrete types such as structs, enums and classes can conform to protocols}}
+      // expected-error@-3 {{type 'any BinaryFloatingPoint' cannot conform to 'BinaryFloatingPoint'}}
+      // expected-note@-4 {{only concrete types such as structs, enums and classes can conform to protocols}}
+      // expected-note@-5 {{required by initializer 'init(value:in:label:onEditingChanged:)' where 'V' = 'any BinaryFloatingPoint'}}
     }
   }
 }