Merge pull request #20196 from gottesmm/pr-287632bfd462700721e50c144278d5edb97f6b6a

[silgen] Scope conditionally emitted code by emitBoolDispatch.

Author: gottesmm

lib/SILGen/SILGenPattern.cpp

@@ -2267,6 +2267,9 @@ emitBoolDispatch(ArrayRef<RowToSpecialize> rows, ConsumableManagedValue src,
     SILBasicBlock *caseBB = caseBBs[i].second;
     SGF.B.setInsertionPoint(caseBB);
 
+    // We're in conditionally-executed code; enter a scope.
+    Scope scope(SGF.Cleanups, CleanupLocation::get(loc));
+
     SILValue result
       = SILUndef::get(SGF.SGM.Types.getEmptyTupleType(), SGF.SGM.M);
     ConsumableManagedValue CMV =

test/SILGen/Inputs/switch_bool.h

@@ -0,0 +1,8 @@
+
+@import Foundation;
+
+typedef NSString * MyStringEnum NS_EXTENSIBLE_STRING_ENUM;
+extern MyStringEnum const MyStringEnumCase1;
+extern MyStringEnum const MyStringEnumCase2;
+extern MyStringEnum const MyStringEnumCase3;
+extern MyStringEnum const MyStringEnumCase4;

test/SILGen/switch_bool.swift

@@ -0,0 +1,22 @@
+// RUN: %target-swift-emit-silgen -module-name switch_bool -import-objc-header %S/Inputs/switch_bool.h %s
+
+// REQUIRES: objc_interop
+
+// For now this test just makes sure that we do not crash on this pattern by
+// running into dominance problems due to not-scoping the subcases of the
+// SwitchValue. So performing a FileCheck test is not really needed. Feel free
+// to add the FileCheck invocation if additional tests require FileCheck though.
+
+func properlyScopeSubcasesOfEmitBoolDispatch() {
+  let e = Optional<MyStringEnum>.none
+  switch (e, false) {
+  case (MyStringEnum.case1?, false):
+    break
+  case (let e?, _):
+    let y = {
+      return e
+    }
+  default:
+    break
+  }
+}