Merge pull request swiftlang#34755 from gottesmm/pr-c948d27bcce9be4feb87ece1fc46b74931415542

[value-lifetime] Cleanup constructors.

Author: gottesmm

include/swift/SILOptimizer/Utils/ValueLifetime.h

@@ -17,6 +17,7 @@
 #ifndef SWIFT_SILOPTIMIZER_UTILS_CFG_H
 #define SWIFT_SILOPTIMIZER_UTILS_CFG_H
 
+#include "swift/Basic/STLExtras.h"
 #include "swift/SIL/SILBuilder.h"
 #include "swift/SIL/SILInstruction.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
@@ -64,18 +65,37 @@ class ValueLifetimeAnalysis {
   /// ValueLifetimeAnalysis with misc iterators including transform
   /// iterators.
   template <typename RangeTy>
-  ValueLifetimeAnalysis(decltype(defValue) def, const RangeTy &userRange)
-      : defValue(def), userSet(userRange.begin(), userRange.end()) {
+  ValueLifetimeAnalysis(SILArgument *def, const RangeTy &useRange)
+      : defValue(def), userSet() {
+    for (SILInstruction *use : useRange)
+      userSet.insert(use);
     propagateLiveness();
   }
 
-  /// Constructor for the value \p def considering all the value's uses.
-  ValueLifetimeAnalysis(SILInstruction *def) : defValue(def) {
-    for (auto result : def->getResults()) {
-      for (Operand *op : result->getUses()) {
-        userSet.insert(op->getUser());
-      }
-    }
+  ValueLifetimeAnalysis(
+      SILArgument *def,
+      llvm::iterator_range<ValueBaseUseIterator> useRange)
+      : defValue(def), userSet() {
+    for (Operand *use : useRange)
+      userSet.insert(use->getUser());
+    propagateLiveness();
+  }
+
+  template <typename RangeTy>
+  ValueLifetimeAnalysis(
+      SILInstruction *def, const RangeTy &useRange)
+      : defValue(def), userSet() {
+    for (SILInstruction *use : useRange)
+      userSet.insert(use);
+    propagateLiveness();
+  }
+
+  ValueLifetimeAnalysis(
+      SILInstruction *def,
+      llvm::iterator_range<ValueBaseUseIterator> useRange)
+      : defValue(def), userSet() {
+    for (Operand *use : useRange)
+      userSet.insert(use->getUser());
     propagateLiveness();
   }
 

lib/SILOptimizer/Transforms/AllocBoxToStack.cpp

@@ -937,7 +937,8 @@ specializeApplySite(SILOptFunctionBuilder &FuncBuilder, ApplySite Apply,
     // release it explicitly when the partial_apply is released.
     if (Apply.getKind() == ApplySiteKind::PartialApplyInst) {
       if (PAFrontier.empty()) {
-        ValueLifetimeAnalysis VLA(cast<PartialApplyInst>(Apply));
+        auto *PAI = cast<PartialApplyInst>(Apply);
+        ValueLifetimeAnalysis VLA(PAI, PAI->getUses());
         pass.CFGChanged |= !VLA.computeFrontier(
             PAFrontier, ValueLifetimeAnalysis::AllowToModifyCFG);
         assert(!PAFrontier.empty() &&