[NFC] OwnedLifetimeCan: Take DeadEndBlocksAnalysis

All clients of OwnedLifetimeCanonicalization pass an instance of the
analysis in.  For now, it's unused.

Author: nate-chandler

include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h

@@ -100,6 +100,7 @@
 #include "swift/Basic/SmallPtrSetVector.h"
 #include "swift/SIL/PrunedLiveness.h"
 #include "swift/SIL/SILInstruction.h"
+#include "swift/SILOptimizer/Analysis/DeadEndBlocksAnalysis.h"
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
@@ -247,6 +248,8 @@ class CanonicalizeOSSALifetime final {
   // extendLivenessThroughOverlappingAccess is invoked.
   NonLocalAccessBlocks *accessBlocks = nullptr;
 
+  DeadEndBlocksAnalysis *deadEndBlocksAnalysis;
+
   DominanceInfo *domTree = nullptr;
 
   BasicCalleeAnalysis *calleeAnalysis;
@@ -326,15 +329,14 @@ class CanonicalizeOSSALifetime final {
     }
   };
 
-  CanonicalizeOSSALifetime(PruneDebugInsts_t pruneDebugMode,
-                           MaximizeLifetime_t maximizeLifetime,
-                           SILFunction *function,
-                           NonLocalAccessBlockAnalysis *accessBlockAnalysis,
-                           DominanceInfo *domTree,
-                           BasicCalleeAnalysis *calleeAnalysis,
-                           InstructionDeleter &deleter)
+  CanonicalizeOSSALifetime(
+      PruneDebugInsts_t pruneDebugMode, MaximizeLifetime_t maximizeLifetime,
+      SILFunction *function, NonLocalAccessBlockAnalysis *accessBlockAnalysis,
+      DeadEndBlocksAnalysis *deadEndBlocksAnalysis, DominanceInfo *domTree,
+      BasicCalleeAnalysis *calleeAnalysis, InstructionDeleter &deleter)
       : pruneDebugMode(pruneDebugMode), maximizeLifetime(maximizeLifetime),
-        accessBlockAnalysis(accessBlockAnalysis), domTree(domTree),
+        accessBlockAnalysis(accessBlockAnalysis),
+        deadEndBlocksAnalysis(deadEndBlocksAnalysis), domTree(domTree),
         calleeAnalysis(calleeAnalysis), deleter(deleter) {}
 
   SILValue getCurrentDef() const { return currentDef; }

lib/SILOptimizer/Mandatory/ConsumeOperatorCopyableValuesChecker.cpp

@@ -222,14 +222,15 @@ struct ConsumeOperatorCopyableValuesChecker {
   InstructionDeleter deleter;
   CanonicalizeOSSALifetime canonicalizer;
 
-  ConsumeOperatorCopyableValuesChecker(SILFunction *fn,
-                                       DominanceInfo *dominance,
-                                       BasicCalleeAnalysis *calleeAnalysis)
+  ConsumeOperatorCopyableValuesChecker(
+      SILFunction *fn, DominanceInfo *dominance,
+      BasicCalleeAnalysis *calleeAnalysis,
+      DeadEndBlocksAnalysis *deadEndBlocksAnalysis)
       : fn(fn), dominance(dominance),
         canonicalizer(DontPruneDebugInsts,
                       MaximizeLifetime_t(!fn->shouldOptimize()), fn,
-                      /*accessBlockAnalysis=*/nullptr, dominance,
-                      calleeAnalysis, deleter) {}
+                      /*accessBlockAnalysis=*/nullptr, deadEndBlocksAnalysis,
+                      dominance, calleeAnalysis, deleter) {}
 
   bool check();
 
@@ -588,8 +589,9 @@ class ConsumeOperatorCopyableValuesCheckerPass : public SILFunctionTransform {
     auto *dominanceAnalysis = getAnalysis<DominanceAnalysis>();
     auto *dominance = dominanceAnalysis->get(fn);
     auto *calleeAnalysis = getAnalysis<BasicCalleeAnalysis>();
-    ConsumeOperatorCopyableValuesChecker checker(getFunction(), dominance,
-                                                 calleeAnalysis);
+    auto *deadEndBlocksAnalysis = getAnalysis<DeadEndBlocksAnalysis>();
+    ConsumeOperatorCopyableValuesChecker checker(
+        getFunction(), dominance, calleeAnalysis, deadEndBlocksAnalysis);
     auto *loopAnalysis = getAnalysis<SILLoopAnalysis>();
 
     if (checker.check()) {

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -1490,7 +1490,7 @@ struct MoveOnlyAddressCheckerPImpl {
       DominanceInfo *domTree, PostOrderAnalysis *poa,
       DeadEndBlocksAnalysis *deba,
       borrowtodestructure::IntervalMapAllocator &allocator)
-      : fn(fn), deleter(), canonicalizer(fn, domTree, deleter),
+      : fn(fn), deleter(), canonicalizer(fn, domTree, deba, deleter),
         addressUseState(domTree), diagnosticEmitter(diagnosticEmitter),
         deba(deba), poa(poa), allocator(allocator) {
     deleter.setCallbacks(std::move(

lib/SILOptimizer/Mandatory/MoveOnlyChecker.cpp

@@ -115,7 +115,8 @@ void MoveOnlyChecker::checkObjects() {
 
   completeObjectLifetimes(moveIntroducersToProcess.getArrayRef());
 
-  MoveOnlyObjectChecker checker{diagnosticEmitter, domTree, poa, allocator};
+  MoveOnlyObjectChecker checker{diagnosticEmitter, domTree, deba, poa,
+                                allocator};
   madeChange |= checker.check(moveIntroducersToProcess);
 }
 

lib/SILOptimizer/Mandatory/MoveOnlyObjectCheckerTester.cpp

@@ -89,6 +89,7 @@ class MoveOnlyObjectCheckerTesterPass : public SILFunctionTransform {
     auto *dominanceAnalysis = getAnalysis<DominanceAnalysis>();
     DominanceInfo *domTree = dominanceAnalysis->get(fn);
     auto *poa = getAnalysis<PostOrderAnalysis>();
+    auto *deba = getAnalysis<DeadEndBlocksAnalysis>();
 
     DiagnosticEmitter diagnosticEmitter(fn);
     borrowtodestructure::IntervalMapAllocator allocator;
@@ -111,7 +112,8 @@ class MoveOnlyObjectCheckerTesterPass : public SILFunctionTransform {
                  << "No move introducers found?! Returning early?!\n");
     } else {
       diagCount = diagnosticEmitter.getDiagnosticCount();
-      MoveOnlyObjectChecker checker{diagnosticEmitter, domTree, poa, allocator};
+      MoveOnlyObjectChecker checker{diagnosticEmitter, domTree, deba, poa,
+                                    allocator};
       madeChange |= checker.check(moveIntroducersToProcess);
     }
 

lib/SILOptimizer/Mandatory/MoveOnlyObjectCheckerUtils.cpp

@@ -175,7 +175,9 @@ struct MoveOnlyObjectCheckerPImpl {
       : fn(fn), allocator(allocator), diagnosticEmitter(diagnosticEmitter),
         moveIntroducersToProcess(moveIntroducersToProcess) {}
 
-  void check(DominanceInfo *domTree, PostOrderAnalysis *poa);
+  void check(DominanceInfo *domTree,
+             DeadEndBlocksAnalysis *deadEndBlocksAnalysis,
+             PostOrderAnalysis *poa);
 
   bool convertBorrowExtractsToOwnedDestructures(
       MarkUnresolvedNonCopyableValueInst *mmci, DominanceInfo *domTree,
@@ -331,8 +333,9 @@ bool MoveOnlyObjectCheckerPImpl::checkForSameInstMultipleUseErrors(
 //                          MARK: Main PImpl Routine
 //===----------------------------------------------------------------------===//
 
-void MoveOnlyObjectCheckerPImpl::check(DominanceInfo *domTree,
-                                       PostOrderAnalysis *poa) {
+void MoveOnlyObjectCheckerPImpl::check(
+    DominanceInfo *domTree, DeadEndBlocksAnalysis *deadEndBlocksAnalysis,
+    PostOrderAnalysis *poa) {
   auto callbacks =
       InstModCallbacks().onDelete([&](SILInstruction *instToDelete) {
         if (auto *mvi =
@@ -341,7 +344,7 @@ void MoveOnlyObjectCheckerPImpl::check(DominanceInfo *domTree,
         instToDelete->eraseFromParent();
       });
   InstructionDeleter deleter(std::move(callbacks));
-  OSSACanonicalizer canonicalizer(fn, domTree, deleter);
+  OSSACanonicalizer canonicalizer(fn, domTree, deadEndBlocksAnalysis, deleter);
   diagnosticEmitter.initCanonicalizer(&canonicalizer);
 
   unsigned initialDiagCount = diagnosticEmitter.getDiagnosticCount();
@@ -561,6 +564,6 @@ bool MoveOnlyObjectChecker::check(
          "Should only call this with actual insts to check?!");
   MoveOnlyObjectCheckerPImpl checker(instsToCheck[0]->getFunction(), allocator,
                                      diagnosticEmitter, instsToCheck);
-  checker.check(domTree, poa);
+  checker.check(domTree, deadEndBlocksAnalysis, poa);
   return checker.changed;
 }

lib/SILOptimizer/Mandatory/MoveOnlyObjectCheckerUtils.h

@@ -47,11 +47,12 @@ struct OSSACanonicalizer {
   CanonicalizeOSSALifetime canonicalizer;
 
   OSSACanonicalizer(SILFunction *fn, DominanceInfo *domTree,
+                    DeadEndBlocksAnalysis *deadEndBlocksAnalysis,
                     InstructionDeleter &deleter)
       : canonicalizer(DontPruneDebugInsts,
                       MaximizeLifetime_t(!fn->shouldOptimize()), fn,
-                      nullptr /*accessBlockAnalysis*/, domTree,
-                      nullptr /*calleeAnalysis*/, deleter) {}
+                      nullptr /*accessBlockAnalysis*/, deadEndBlocksAnalysis,
+                      domTree, nullptr /*calleeAnalysis*/, deleter) {}
 
   void clear() {
     consumingUsesNeedingCopy.clear();
@@ -176,6 +177,7 @@ bool searchForCandidateObjectMarkUnresolvedNonCopyableValueInsts(
 struct MoveOnlyObjectChecker {
   DiagnosticEmitter &diagnosticEmitter;
   DominanceInfo *domTree;
+  DeadEndBlocksAnalysis *deadEndBlocksAnalysis;
   PostOrderAnalysis *poa;
   borrowtodestructure::IntervalMapAllocator &allocator;
 

lib/SILOptimizer/Transforms/CopyPropagation.cpp

@@ -452,6 +452,7 @@ void CopyPropagation::run() {
   auto *f = getFunction();
   auto *postOrderAnalysis = getAnalysis<PostOrderAnalysis>();
   auto *accessBlockAnalysis = getAnalysis<NonLocalAccessBlockAnalysis>();
+  auto *deadEndBlocksAnalysis = getAnalysis<DeadEndBlocksAnalysis>();
   auto *dominanceAnalysis = getAnalysis<DominanceAnalysis>();
   auto *calleeAnalysis = getAnalysis<BasicCalleeAnalysis>();
   DominanceInfo *domTree = dominanceAnalysis->get(f);
@@ -497,7 +498,8 @@ void CopyPropagation::run() {
   // don't need to explicitly check for changes.
   CanonicalizeOSSALifetime canonicalizer(
       pruneDebug, MaximizeLifetime_t(!getFunction()->shouldOptimize()),
-      getFunction(), accessBlockAnalysis, domTree, calleeAnalysis, deleter);
+      getFunction(), accessBlockAnalysis, deadEndBlocksAnalysis, domTree,
+      calleeAnalysis, deleter);
   // NOTE: We assume that the function is in reverse post order so visiting the
   //       blocks and pushing begin_borrows as we see them and then popping them
   //       off the end will result in shrinking inner borrow scopes first.

lib/SILOptimizer/Transforms/SILMem2Reg.cpp

@@ -2146,7 +2146,8 @@ void MemoryToRegisters::canonicalizeValueLifetimes(
   }
   CanonicalizeOSSALifetime canonicalizer(
       PruneDebugInsts, MaximizeLifetime_t(!f.shouldOptimize()), &f,
-      accessBlockAnalysis, domInfo, calleeAnalysis, deleter);
+      accessBlockAnalysis, deadEndBlocksAnalysis, domInfo, calleeAnalysis,
+      deleter);
   for (auto value : owned) {
     if (isa<SILUndef>(value) || value->isMarkedAsDeleted())
       continue;

lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp

@@ -1282,6 +1282,8 @@ static FunctionTest CanonicalizeOSSALifetimeTest(
     [](auto &function, auto &arguments, auto &test) {
       auto *accessBlockAnalysis =
           test.template getAnalysis<NonLocalAccessBlockAnalysis>();
+      auto *deadEndBlocksAnalysis =
+          test.template getAnalysis<DeadEndBlocksAnalysis>();
       auto *dominanceAnalysis = test.template getAnalysis<DominanceAnalysis>();
       DominanceInfo *domTree = dominanceAnalysis->get(&function);
       auto *calleeAnalysis = test.template getAnalysis<BasicCalleeAnalysis>();
@@ -1291,8 +1293,8 @@ static FunctionTest CanonicalizeOSSALifetimeTest(
       InstructionDeleter deleter;
       CanonicalizeOSSALifetime canonicalizer(
           pruneDebug, maximizeLifetimes, &function,
-          respectAccessScopes ? accessBlockAnalysis : nullptr, domTree,
-          calleeAnalysis, deleter);
+          respectAccessScopes ? accessBlockAnalysis : nullptr,
+          deadEndBlocksAnalysis, domTree, calleeAnalysis, deleter);
       auto value = arguments.takeValue();
       SmallVector<SILInstruction *, 4> lexicalLifetimeEnds;
       while (arguments.hasUntaken()) {