Move PrunedLiveness so it can be used as a lightweight OSSA helper.

For use in OwnershipUtils.

Author: atrick

include/swift/SILOptimizer/Utils/PrunedLiveness.h renamed to include/swift/SIL/PrunedLiveness.h

@@ -12,7 +12,9 @@
 ///
 /// Incrementally compute and represent basic block liveness of a single live
 /// range. The live range is defined by points in the CFG, independent of any
-/// particular SSA value. The client initializes liveness with a set of
+/// particular SSA value; however, it must be contiguous. Unlike traditional
+/// variable liveness, a definition within the live range does not create a
+/// "hole" in the live range. The client initializes liveness with a set of
 /// definition blocks, typically a single block. The client then incrementally
 /// updates liveness by providing a set of "interesting" uses one at a time.
 ///
@@ -137,7 +139,10 @@ class PrunedLiveBlocks {
 public:
   bool empty() const { return liveBlocks.empty(); }
 
-  void clear() { liveBlocks.clear(); SWIFT_ASSERT_ONLY(seenUse = false); }
+  void clear() {
+    liveBlocks.clear();
+    SWIFT_ASSERT_ONLY(seenUse = false);
+  }
 
   unsigned numLiveBlocks() const { return liveBlocks.size(); }
 

include/swift/SILOptimizer/Utils/CanonicalOSSALifetime.h

@@ -98,11 +98,11 @@
 
 #include "swift/Basic/DAGNodeWorklist.h"
 #include "swift/Basic/SmallPtrSetVector.h"
+#include "swift/SIL/PrunedLiveness.h"
 #include "swift/SIL/SILInstruction.h"
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
-#include "swift/SILOptimizer/Utils/PrunedLiveness.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SetVector.h"
 

include/swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h

@@ -30,11 +30,11 @@
 #include "swift/Basic/DAGNodeWorklist.h"
 #include "swift/Basic/SmallPtrSetVector.h"
 #include "swift/SIL/OwnershipUtils.h"
+#include "swift/SIL/PrunedLiveness.h"
 #include "swift/SIL/SILInstruction.h"
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
 #include "swift/SILOptimizer/Analysis/NonLocalAccessBlockAnalysis.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
-#include "swift/SILOptimizer/Utils/PrunedLiveness.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SetVector.h"
 

lib/SIL/Utils/CMakeLists.txt

@@ -13,6 +13,7 @@ target_sources(swiftSIL PRIVATE
   OwnershipUtils.cpp
   PrettyStackTrace.cpp
   Projection.cpp
+  PrunedLiveness.cpp
   SILBridging.cpp
   SILInstructionWorklist.cpp
   SILRemarkStreamer.cpp

lib/SIL/Utils/OwnershipUtils.cpp

@@ -15,8 +15,9 @@
 #include "swift/Basic/SmallPtrSetVector.h"
 #include "swift/SIL/InstructionUtils.h"
 #include "swift/SIL/LinearLifetimeChecker.h"
-#include "swift/SIL/Projection.h"
 #include "swift/SIL/MemAccessUtils.h"
+#include "swift/SIL/Projection.h"
+#include "swift/SIL/PrunedLiveness.h"
 #include "swift/SIL/SILArgument.h"
 #include "swift/SIL/SILInstruction.h"
 

lib/SILOptimizer/Utils/PrunedLiveness.cpp renamed to lib/SIL/Utils/PrunedLiveness.cpp

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/SILOptimizer/Utils/PrunedLiveness.h"
+#include "swift/SIL/PrunedLiveness.h"
 #include "swift/SIL/OwnershipUtils.h"
 
 using namespace swift;
@@ -105,14 +105,13 @@ bool PrunedLiveness::updateForBorrowingOperand(Operand *op) {
   // TODO: Handle reborrowed copies by considering the extended borrow
   // scope. Temporarily bail-out on reborrows because we can't handle uses
   // that aren't dominated by currentDef.
-  if (!BorrowingOperand(op).visitScopeEndingUses(
-        [this](Operand *end) {
-          if (end->getOperandOwnership() == OperandOwnership::Reborrow) {
-            return false;
-          }
-          updateForUse(end->getUser(), /*lifetimeEnding*/ false);
-          return true;
-        })) {
+  if (!BorrowingOperand(op).visitScopeEndingUses([this](Operand *end) {
+        if (end->getOperandOwnership() == OperandOwnership::Reborrow) {
+          return false;
+        }
+        updateForUse(end->getUser(), /*lifetimeEnding*/ false);
+        return true;
+      })) {
     return false;
   }
   return true;

lib/SILOptimizer/Mandatory/DiagnoseLifetimeIssues.cpp

@@ -35,8 +35,8 @@
 #include "swift/SIL/ApplySite.h"
 #include "swift/SIL/BasicBlockBits.h"
 #include "swift/SIL/OwnershipUtils.h"
+#include "swift/SIL/PrunedLiveness.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
-#include "swift/SILOptimizer/Utils/PrunedLiveness.h"
 #include "clang/AST/DeclObjC.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/Debug.h"

lib/SILOptimizer/Utils/CMakeLists.txt

@@ -20,7 +20,6 @@ target_sources(swiftSILOptimizer PRIVATE
   OptimizerStatsUtils.cpp
   PartialApplyCombiner.cpp
   PerformanceInlinerUtils.cpp
-  PrunedLiveness.cpp
   SILInliner.cpp
   SILSSAUpdater.cpp
   SpecializationMangler.cpp