Merge pull request #74374 from jckarter/dead-before-live-def-block-assertion-failure

MoveOnlyAddressChecker: Turn assertion into early exit.

Author: jckarter

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -2934,13 +2934,13 @@ bool GlobalLivenessChecker::testInstVectorLiveness(
           continue;
         case IsLive::LiveOut: {
           LLVM_DEBUG(llvm::dbgs() << "    Live out block!\n");
-          // If we see a live out block that is also a def block, we need to fa
-#ifndef NDEBUG
+          // If we see a live out block that is also a def block, skip.
           SmallBitVector defBits(addressUseState.getNumSubelements());
           liveness.isDefBlock(block, errorSpan, defBits);
-          assert((defBits & errorSpan).none() &&
-                 "If in def block... we are in liveness block");
-#endif
+          if (!(defBits & errorSpan).none()) {
+            LLVM_DEBUG(llvm::dbgs() << "    Also a def block; skipping!\n");
+            continue;
+          }
           [[clang::fallthrough]];
         }
         case IsLive::LiveWithin:

test/SILOptimizer/moveonly_addresschecker_branch_order.swift

@@ -0,0 +1,26 @@
+//RUN: %target-swift-frontend -emit-sil -verify %s
+
+@_silgen_name("cond")
+func cond() -> Bool
+
+struct Foo: ~Copyable {}
+
+func consume(_: consuming Foo) {}
+
+func test1(_ x: inout Foo, _ y: consuming Foo) { // expected-error{{missing reinitialization}}
+    consume(x) // expected-note{{consumed here}}
+    if cond() {
+        return
+    } else {
+        x = y
+    }
+}
+
+func test2(_ x: inout Foo, _ y: consuming Foo) { // expected-error{{missing reinitialization}}
+    consume(x) // expected-note{{consumed here}}
+    if cond() {
+        x = y
+    } else {
+        return
+    }
+}