Merge pull request #64161 from gottesmm/pr-e9199690b31f6695cd42471f85f41b6493f722c1

[move-only] Fix crash due to an earlier change I made to move end_borrow out of addressUseChecker and into the liveness checker.

Author: gottesmm

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -1646,6 +1646,28 @@ bool GlobalLivenessChecker::testInstVectorLiveness(
           break;
         }
 
+        // Check if we have a non-consuming liveness use.
+        //
+        // DISCUSSION: In certain cases, we only represent uses like end_borrow
+        // in liveness and not in address use state. This ensures that we
+        // properly emit a diagnostic in these cases.
+        //
+        // TODO: We should include liveness uses of the load_borrow itself in an
+        // array and emit an error on those instead since it would be a better
+        // error than using end_borrow here.
+        {
+          auto pair = liveness.isInterestingUser(&*ii);
+          if (pair.first == FieldSensitivePrunedLiveness::NonLifetimeEndingUse &&
+              pair.second->contains(errorSpan)) {
+            diagnosticEmitter.emitAddressDiagnostic(
+                addressUseState.address, &*ii, errorUser, false /*is consuming*/,
+                addressUseState.isInOutTermUser(&*ii));
+            foundSingleBlockError = true;
+            emittedDiagnostic = true;
+            break;
+          }
+        }
+
         if (addressUseState.isInitUse(&*ii, errorSpan)) {
           llvm::errs() << "Should not have errored if we see an init?! Init: "
                        << *ii;

test/SILOptimizer/moveonly_addresschecker_diagnostics.sil

@@ -261,3 +261,21 @@ bb0(%0 : @owned $NonTrivialStruct):
   %27 = tuple ()
   return %27 : $()
 }
+
+sil @borrow_and_consume : $@convention(thin) (@guaranteed NonTrivialStruct, @owned NonTrivialStruct) -> ()
+
+sil hidden [ossa] @$s4test1d1xyAA1NonTrivialStructVn_tF : $@convention(thin) (@owned NonTrivialStruct) -> () {
+bb0(%0 : @owned $NonTrivialStruct):
+  %1 = alloc_stack $NonTrivialStruct, let, name "x", argno 1
+  %2 = mark_must_check [consumable_and_assignable] %1 : $*NonTrivialStruct // expected-error {{'x' used after consume}}
+  store %0 to [init] %2 : $*NonTrivialStruct
+  %4 = load_borrow %2 : $*NonTrivialStruct
+  %5 = load [copy] %2 : $*NonTrivialStruct // expected-note {{consuming use here}}
+  %6 = function_ref @borrow_and_consume : $@convention(thin) (@guaranteed NonTrivialStruct, @owned NonTrivialStruct) -> ()
+  %7 = apply %6(%4, %5) : $@convention(thin) (@guaranteed NonTrivialStruct, @owned NonTrivialStruct) -> ()
+  end_borrow %4 : $NonTrivialStruct // expected-note {{non-consuming use here}}
+  destroy_addr %2 : $*NonTrivialStruct
+  dealloc_stack %1 : $*NonTrivialStruct
+  %11 = tuple ()
+  return %11 : $()
+}

test/SILOptimizer/moveonly_addresschecker_diagnostics.swift

@@ -2455,3 +2455,15 @@ func inoutCaptureTest() -> (() -> ()) {
 
     return f
 }
+
+////////////////
+// Misc Tests //
+////////////////
+
+func borrowAndConsumeAtSameTime(_: __shared NonTrivialStruct, consume _: __owned NonTrivialStruct) {}
+
+func borrowAndConsumeAtSameTimeTest(x: __owned NonTrivialStruct) { // expected-error {{'x' used after consume}}
+    borrowAndConsumeAtSameTime(x, consume: x)
+    // expected-note @-1 {{consuming use here}}
+    // expected-note @-2 {{non-consuming use here}}
+}