Merge pull request #75408 from nate-chandler/cherrypick/release/6.0/rdar131960619

6.0: [MoveOnlyAddressChecker] Exclusivity handles DeadEnds.

Author: nate-chandler

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerTester.cpp

@@ -89,6 +89,7 @@ class MoveOnlyAddressCheckerTesterPass : public SILFunctionTransform {
     auto *dominanceAnalysis = getAnalysis<DominanceAnalysis>();
     DominanceInfo *domTree = dominanceAnalysis->get(fn);
     auto *poa = getAnalysis<PostOrderAnalysis>();
+    auto *deadEndBlocksAnalysis = getAnalysis<DeadEndBlocksAnalysis>();
 
     DiagnosticEmitter diagnosticEmitter(fn);
     llvm::SmallSetVector<MarkUnresolvedNonCopyableValueInst *, 32>
@@ -108,7 +109,8 @@ class MoveOnlyAddressCheckerTesterPass : public SILFunctionTransform {
     } else {
       borrowtodestructure::IntervalMapAllocator allocator;
       MoveOnlyAddressChecker checker{getFunction(), diagnosticEmitter,
-                                     allocator, domTree, poa};
+                                     allocator,     domTree,
+                                     poa,           deadEndBlocksAnalysis};
       madeChange = checker.completeLifetimes();
       madeChange |= checker.check(moveIntroducersToProcess);
     }

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -1473,6 +1473,8 @@ struct MoveOnlyAddressCheckerPImpl {
   /// Information about destroys that we use when inserting destroys.
   ConsumeInfo consumes;
 
+  DeadEndBlocksAnalysis *deba;
+
   /// PostOrderAnalysis used by the BorrowToDestructureTransform.
   PostOrderAnalysis *poa;
 
@@ -1482,10 +1484,11 @@ struct MoveOnlyAddressCheckerPImpl {
   MoveOnlyAddressCheckerPImpl(
       SILFunction *fn, DiagnosticEmitter &diagnosticEmitter,
       DominanceInfo *domTree, PostOrderAnalysis *poa,
+      DeadEndBlocksAnalysis *deba,
       borrowtodestructure::IntervalMapAllocator &allocator)
       : fn(fn), deleter(), canonicalizer(fn, domTree, deleter),
         addressUseState(domTree), diagnosticEmitter(diagnosticEmitter),
-        poa(poa), allocator(allocator) {
+        deba(deba), poa(poa), allocator(allocator) {
     deleter.setCallbacks(std::move(
         InstModCallbacks().onDelete([&](SILInstruction *instToDelete) {
           if (auto *mvi =
@@ -2045,7 +2048,9 @@ struct GatherUsesVisitor : public TransitiveAddressWalker<GatherUsesVisitor> {
     liveness->initializeDef(bai);
     liveness->computeSimple();
     for (auto *consumingUse : li->getConsumingUses()) {
-      if (!liveness->isWithinBoundary(consumingUse->getUser())) {
+      if (!liveness->areUsesWithinBoundary(
+              {consumingUse},
+              moveChecker.deba->get(consumingUse->getFunction()))) {
         diagnosticEmitter.emitAddressExclusivityHazardDiagnostic(
             markedValue, consumingUse->getUser());
         emittedError = true;
@@ -3976,7 +3981,7 @@ bool MoveOnlyAddressChecker::check(
   assert(moveIntroducersToProcess.size() &&
          "Must have checks to process to call this function");
   MoveOnlyAddressCheckerPImpl pimpl(fn, diagnosticEmitter, domTree, poa,
-                                    allocator);
+                                    deadEndBlocksAnalysis, allocator);
 
 #ifndef NDEBUG
   static uint64_t numProcessed = 0;

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.h

@@ -18,6 +18,7 @@
 namespace swift {
 
 class PostOrderAnalysis;
+class DeadEndBlocksAnalysis;
 
 namespace siloptimizer {
 
@@ -39,6 +40,7 @@ struct MoveOnlyAddressChecker {
   borrowtodestructure::IntervalMapAllocator &allocator;
   DominanceInfo *domTree;
   PostOrderAnalysis *poa;
+  DeadEndBlocksAnalysis *deadEndBlocksAnalysis;
 
   /// \returns true if we changed the IR. To see if we emitted a diagnostic, use
   /// \p diagnosticEmitter.getDiagnosticCount().

lib/SILOptimizer/Mandatory/MoveOnlyChecker.cpp

@@ -78,13 +78,13 @@ struct MoveOnlyChecker {
   SILFunction *fn;
   DominanceInfo *domTree;
   PostOrderAnalysis *poa;
+  DeadEndBlocksAnalysis *deba;
   bool madeChange = false;
   borrowtodestructure::IntervalMapAllocator allocator;
 
   MoveOnlyChecker(SILFunction *fn, DominanceInfo *domTree,
-                  PostOrderAnalysis *poa)
-      : diagnosticEmitter(fn), fn(fn), domTree(domTree), poa(poa) {
-  }
+                  PostOrderAnalysis *poa, DeadEndBlocksAnalysis *deba)
+      : diagnosticEmitter(fn), fn(fn), domTree(domTree), poa(poa), deba(deba) {}
 
   void checkObjects();
   void completeObjectLifetimes(ArrayRef<MarkUnresolvedNonCopyableValueInst *>);
@@ -200,8 +200,8 @@ void MoveOnlyChecker::checkAddresses() {
     return;
   }
 
-  MoveOnlyAddressChecker checker{fn, diagnosticEmitter, allocator, domTree,
-                                 poa};
+  MoveOnlyAddressChecker checker{
+      fn, diagnosticEmitter, allocator, domTree, poa, deba};
   madeChange |= checker.completeLifetimes();
   madeChange |= checker.check(moveIntroducersToProcess);
 }
@@ -253,9 +253,9 @@ class MoveOnlyCheckerPass : public SILFunctionTransform {
     LLVM_DEBUG(llvm::dbgs()
                << "===> MoveOnly Checker. Visiting: " << fn->getName() << '\n');
 
-    MoveOnlyChecker checker(
-        fn, getAnalysis<DominanceAnalysis>()->get(fn),
-        getAnalysis<PostOrderAnalysis>());
+    MoveOnlyChecker checker(fn, getAnalysis<DominanceAnalysis>()->get(fn),
+                            getAnalysis<PostOrderAnalysis>(),
+                            getAnalysis<DeadEndBlocksAnalysis>());
 
     checker.checkObjects();
     checker.checkAddresses();

test/SILOptimizer/moveonly_addresschecker.swift

@@ -37,3 +37,14 @@ func testAssertLikeUseDifferentBits() {
         }
     }
 }
+
+// issue #75312
+struct S
+{
+    @usableFromInline
+    init(utf8:consuming [UInt8])
+    {
+        utf8.withUnsafeBufferPointer { _ in }
+        fatalError()
+    }
+}