[NFC] SIL: Promote OperandToUser to SILInstruction

Put it alongsidde OperandToValue and friends.

Author: nate-chandler

include/swift/SIL/SILInstruction.h

@@ -670,6 +670,10 @@ class SILInstruction : public llvm::ilist_node<SILInstruction> {
   using TransformedOperandValueRange =
     OptionalTransformRange<ArrayRef<Operand>, OperandToTransformedValue>;
 
+  /// Functor for Operand::getUser()
+  struct OperandToUser;
+  using OperandUserRange = TransformRange<ArrayRef<Operand *>, OperandToUser>;
+
   static OperandValueRange getOperandValues(ArrayRef<Operand*> operands);
 
   OperandRefValueRange getOperandValues() const;
@@ -1021,6 +1025,12 @@ struct SILInstruction::OperandRefToValue {
   }
 };
 
+struct SILInstruction::OperandToUser {
+  SILInstruction *operator()(const Operand *use) const {
+    return const_cast<Operand *>(use)->getUser();
+  }
+};
+
 struct SILInstruction::FilterOperandToRealOperand {
   const SILInstruction &i;
 

lib/SILOptimizer/SemanticARC/OwnershipLiveRange.cpp

@@ -363,12 +363,14 @@ OwnershipLiveRange::hasUnknownConsumingUse(bool assumingAtFixPoint) const {
   return HasConsumingUse_t::YesButAllPhiArgs;
 }
 
-OwnershipLiveRange::DestroyingInstsRange
+SILInstruction::OperandUserRange
 OwnershipLiveRange::getDestroyingInsts() const {
-  return DestroyingInstsRange(getDestroyingUses(), OperandToUser());
+  return SILInstruction::OperandUserRange(getDestroyingUses(),
+                                          SILInstruction::OperandToUser());
 }
 
-OwnershipLiveRange::ConsumingInstsRange
+SILInstruction::OperandUserRange
 OwnershipLiveRange::getAllConsumingInsts() const {
-  return ConsumingInstsRange(consumingUses, OperandToUser());
+  return SILInstruction::OperandUserRange(consumingUses,
+                                          SILInstruction::OperandToUser());
 }

lib/SILOptimizer/SemanticARC/OwnershipLiveRange.h

@@ -113,17 +113,9 @@ class LLVM_LIBRARY_VISIBILITY OwnershipLiveRange {
     return unknownConsumingUses;
   }
 
-private:
-  struct OperandToUser;
+  SILInstruction::OperandUserRange getDestroyingInsts() const;
 
-public:
-  using DestroyingInstsRange =
-      TransformRange<ArrayRef<Operand *>, OperandToUser>;
-  DestroyingInstsRange getDestroyingInsts() const;
-
-  using ConsumingInstsRange =
-      TransformRange<ArrayRef<Operand *>, OperandToUser>;
-  ConsumingInstsRange getAllConsumingInsts() const;
+  SILInstruction::OperandUserRange getAllConsumingInsts() const;
 
   /// If this LiveRange has a single destroying use, return that use. Otherwise,
   /// return nullptr.
@@ -198,16 +190,6 @@ class LLVM_LIBRARY_VISIBILITY OwnershipLiveRange {
                                   DeadEndBlocks &deadEndBlocks,
                                   ValueLifetimeAnalysis::Frontier &scratch);
 };
-
-struct OwnershipLiveRange::OperandToUser {
-  OperandToUser() {}
-
-  SILInstruction *operator()(const Operand *use) const {
-    auto *nonConstUse = const_cast<Operand *>(use);
-    return nonConstUse->getUser();
-  }
-};
-
 } // namespace semanticarc
 } // namespace swift