Merge pull request #34603 from xedin/rdar-70256351

[ResultBuilders] Account of a fact that re-write of a statement can fail

Author: xedin

lib/Sema/BuilderTransform.cpp

@@ -1158,6 +1158,12 @@ class BuilderClosureRewriter
             stmt,
             ResultBuilderTarget{ResultBuilderTarget::TemporaryVar,
                                   std::move(captured)});
+
+        // Re-write of statements that envolve type-checking
+        // could fail, such a failure terminates the walk.
+        if (!finalStmt)
+          return nullptr;
+
         newElements.push_back(finalStmt);
         continue;
       }
@@ -1512,7 +1518,7 @@ BraceStmt *swift::applyResultBuilderTransform(
           rewriteTarget) {
   BuilderClosureRewriter rewriter(solution, dc, applied, rewriteTarget);
   auto captured = rewriter.takeCapturedStmt(body);
-  return cast<BraceStmt>(
+  return cast_or_null<BraceStmt>(
     rewriter.visitBraceStmt(
       body,
       ResultBuilderTarget::forReturn(applied.returnExpr),

validation-test/Sema/SwiftUI/rdar70256351.swift

@@ -0,0 +1,19 @@
+// RUN: %target-typecheck-verify-swift -target x86_64-apple-macosx10.15 -swift-version 5
+// REQUIRES: objc_interop
+// REQUIRES: OS=macosx
+
+import SwiftUI
+
+struct ContentView: View {
+  @State private var currentPage = "1"
+
+  var body: some View {
+    switch currentPage {
+    case 1: // expected-error {{expression pattern of type 'Int' cannot match values of type 'String'}}
+            // expected-note@-1 {{overloads for '~=' exist with these partially matching parameter lists: (Substring, String)}}
+      Text("1")
+    default:
+      Text("default")
+    }
+  }
+}