Merge pull request swiftlang#34811 from gottesmm/pr-81ab56860285486f13f9c56ac738e128e170a9c7

[sil] Add a non-const version of SILPhiArgument *BranchInst::getArgForOperand(Operand *)

Author: gottesmm

include/swift/SIL/SILInstruction.h

@@ -7686,10 +7686,16 @@ class BranchInst final
   unsigned getNumArgs() const { return getAllOperands().size(); }
   SILValue getArg(unsigned i) const { return getAllOperands()[i].get(); }
 
+  /// Return the SILPhiArgument for the given operand.
+  const SILPhiArgument *getArgForOperand(const Operand *oper) const {
+    auto *self = const_cast<BranchInst *>(this);
+    return self->getArgForOperand(oper);
+  }
+
   /// Return the SILPhiArgument for the given operand.
   ///
   /// See SILArgument.cpp.
-  const SILPhiArgument *getArgForOperand(const Operand *oper) const;
+  SILPhiArgument *getArgForOperand(const Operand *oper);
 };
 
 /// A conditional branch.

lib/SIL/IR/SILArgument.cpp

@@ -300,7 +300,7 @@ TermInst *SILPhiArgument::getSingleTerminator() const {
   return const_cast<SILBasicBlock *>(predBlock)->getTerminator();
 }
 
-const SILPhiArgument *BranchInst::getArgForOperand(const Operand *oper) const {
+SILPhiArgument *BranchInst::getArgForOperand(const Operand *oper) {
   assert(oper->getUser() == this);
   return cast<SILPhiArgument>(
       getDestBB()->getArgument(oper->getOperandNumber()));