Merge pull request #66909 from gottesmm/release-5.9-rdar111060475

[5.9][move-only] Remove use after move in CopiedLoadBorrowEliminationVisitor.

Author: gottesmm

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -1437,15 +1437,49 @@ class ExtendUnconsumedLiveness {
 
 namespace {
 
+struct CopiedLoadBorrowEliminationState {
+  SILFunction *fn;
+  StackList<LoadBorrowInst *> targets;
+
+  CopiedLoadBorrowEliminationState(SILFunction *fn) : fn(fn), targets(fn) {}
+
+  void process() {
+    if (targets.empty())
+      return;
+
+    while (!targets.empty()) {
+      auto *lbi = targets.pop_back_val();
+      SILBuilderWithScope builder(lbi);
+      SILValue li = builder.emitLoadValueOperation(
+          lbi->getLoc(), lbi->getOperand(), LoadOwnershipQualifier::Copy);
+      SILValue borrow = builder.createBeginBorrow(lbi->getLoc(), li);
+
+      for (auto *ebi : lbi->getEndBorrows()) {
+        auto *next = ebi->getNextInstruction();
+        SILBuilderWithScope builder(next);
+        auto loc = RegularLocation::getAutoGeneratedLocation();
+        builder.emitDestroyValueOperation(loc, li);
+      }
+
+      lbi->replaceAllUsesWith(borrow);
+      lbi->eraseFromParent();
+    }
+
+    LLVM_DEBUG(llvm::dbgs() << "After Load Borrow Elim. Func Dump Start! ";
+               fn->print(llvm::dbgs()));
+    LLVM_DEBUG(llvm::dbgs() << "After Load Borrow Elim. Func Dump End!\n");
+  }
+};
+
 /// An early transform that we run to convert any load_borrow that are copied
 /// directly or that have any subelement that is copied to a load [copy]. This
 /// lets the rest of the optimization handle these as appropriate.
 struct CopiedLoadBorrowEliminationVisitor final
     : public TransitiveAddressWalker {
-  SILFunction *fn;
-  StackList<LoadBorrowInst *> targets;
+  CopiedLoadBorrowEliminationState &state;
 
-  CopiedLoadBorrowEliminationVisitor(SILFunction *fn) : fn(fn), targets(fn) {}
+  CopiedLoadBorrowEliminationVisitor(CopiedLoadBorrowEliminationState &state)
+      : state(state) {}
 
   bool visitUse(Operand *op) override {
     LLVM_DEBUG(llvm::dbgs() << "CopiedLBElim visiting ";
@@ -1531,36 +1565,9 @@ struct CopiedLoadBorrowEliminationVisitor final
     if (!shouldConvertToLoadCopy)
       return true;
 
-    targets.push_back(lbi);
+    state.targets.push_back(lbi);
     return true;
   }
-
-  void process() {
-    if (targets.empty())
-      return;
-
-    while (!targets.empty()) {
-      auto *lbi = targets.pop_back_val();
-      SILBuilderWithScope builder(lbi);
-      SILValue li = builder.emitLoadValueOperation(
-          lbi->getLoc(), lbi->getOperand(), LoadOwnershipQualifier::Copy);
-      SILValue borrow = builder.createBeginBorrow(lbi->getLoc(), li);
-
-      for (auto *ebi : lbi->getEndBorrows()) {
-        auto *next = ebi->getNextInstruction();
-        SILBuilderWithScope builder(next);
-        auto loc = RegularLocation::getAutoGeneratedLocation();
-        builder.emitDestroyValueOperation(loc, li);
-      }
-
-      lbi->replaceAllUsesWith(borrow);
-      lbi->eraseFromParent();
-    }
-
-    LLVM_DEBUG(llvm::dbgs() << "After Load Borrow Elim. Func Dump Start! ";
-               fn->print(llvm::dbgs()));
-    LLVM_DEBUG(llvm::dbgs() << "After Load Borrow Elim. Func Dump End!\n");
-  }
 };
 
 } // namespace
@@ -3134,14 +3141,15 @@ bool MoveOnlyAddressCheckerPImpl::performSingleCheck(
   // [copy] + begin_borrow for further processing. This just eliminates a case
   // that the checker doesn't need to know about.
   {
-    CopiedLoadBorrowEliminationVisitor copiedLoadBorrowEliminator(fn);
+    CopiedLoadBorrowEliminationState state(markedAddress->getFunction());
+    CopiedLoadBorrowEliminationVisitor copiedLoadBorrowEliminator(state);
     if (AddressUseKind::Unknown ==
         std::move(copiedLoadBorrowEliminator).walk(markedAddress)) {
       LLVM_DEBUG(llvm::dbgs() << "Failed copied load borrow eliminator visit: "
                               << *markedAddress);
       return false;
     }
-    copiedLoadBorrowEliminator.process();
+    state.process();
   }
 
   // Then gather all uses of our address by walking from def->uses. We use this