Merge pull request swiftlang#38200 from xedin/rdar-79746785-5.5

[5.5][ResultBuilders] Allow pre-check to look into single-statement closures

Author: DougGregor

lib/Sema/BuilderTransform.cpp

@@ -1872,12 +1872,8 @@ class PreCheckResultBuilderApplication : public ASTWalker {
           E, DC, /*replaceInvalidRefsWithErrors=*/true);
       HasError |= transaction.hasErrors();
 
-      if (!HasError) {
-        E->forEachChildExpr([&](Expr *expr) {
-          HasError |= isa<ErrorExpr>(expr);
-          return HasError ? nullptr : expr;
-        });
-      }
+      if (!HasError)
+        HasError |= containsErrorExpr(E);
 
       if (SuppressDiagnostics)
         transaction.abort();
@@ -1899,6 +1895,29 @@ class PreCheckResultBuilderApplication : public ASTWalker {
     return std::make_pair(true, S);
   }
 
+  /// Check whether given expression (including single-statement
+  /// closures) contains `ErrorExpr` as one of its sub-expressions.
+  bool containsErrorExpr(Expr *expr) {
+    bool hasError = false;
+
+    expr->forEachChildExpr([&](Expr *expr) -> Expr * {
+      hasError |= isa<ErrorExpr>(expr);
+      if (hasError)
+        return nullptr;
+
+      if (auto *closure = dyn_cast<ClosureExpr>(expr)) {
+        if (shouldTypeCheckInEnclosingExpression(closure)) {
+          hasError |= containsErrorExpr(closure->getSingleExpressionBody());
+          return hasError ? nullptr : expr;
+        }
+      }
+
+      return expr;
+    });
+
+    return hasError;
+  }
+
   /// Ignore patterns.
   std::pair<bool, Pattern*> walkToPatternPre(Pattern *pat) override {
     return { false, pat };

test/Constraints/result_builder_diags.swift

@@ -727,4 +727,13 @@ struct TuplifiedStructWithInvalidClosure {
       42
     }
   }
+
+  @TupleBuilder var nestedErrorsDiagnosedByParser: some Any {
+    tuplify(true) { _ in
+      tuplify { _ in
+        self. // expected-error {{expected member name following '.'}}
+      }
+      42
+    }
+  }
 }