From 57ee0435bd47f23f3939f402914c231b4f65ca5e Mon Sep 17 00:00:00 2001 From: Djordje Todorovic Date: Thu, 31 Oct 2019 14:48:32 +0100 Subject: [TII] Use optional destination and source pair as a return value; NFC Refactor usage of isCopyInstrImpl, isCopyInstr and isAddImmediate methods to return optional machine operand pair of destination and source registers. Patch by Nikola Prica Differential Revision: https://reviews.llvm.org/D69622 --- llvm/lib/CodeGen/TargetInstrInfo.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'llvm/lib/CodeGen/TargetInstrInfo.cpp') diff --git a/llvm/lib/CodeGen/TargetInstrInfo.cpp b/llvm/lib/CodeGen/TargetInstrInfo.cpp index 88fbfcb7784..f5f53b50ab8 100644 --- a/llvm/lib/CodeGen/TargetInstrInfo.cpp +++ b/llvm/lib/CodeGen/TargetInstrInfo.cpp @@ -1124,14 +1124,13 @@ Optional TargetInstrInfo::describeLoadedValue(const MachineInstr &MI) const { const MachineFunction *MF = MI.getMF(); DIExpression *Expr = DIExpression::get(MF->getFunction().getContext(), {}); - const MachineOperand *SrcRegOp, *DestRegOp; int64_t Offset; - if (isCopyInstr(MI, SrcRegOp, DestRegOp)) { - return ParamLoadedValue(*SrcRegOp, Expr); - } else if (isAddImmediate(MI, DestRegOp, SrcRegOp, Offset)) { + if (auto DestSrc = isCopyInstr(MI)) { + return ParamLoadedValue(DestSrc->Source, Expr); + } else if (auto DestSrc = isAddImmediate(MI, Offset)) { Expr = DIExpression::prepend(Expr, DIExpression::ApplyOffset, Offset); - return ParamLoadedValue(*SrcRegOp, Expr); + return ParamLoadedValue(DestSrc->Source, Expr); } return None; -- cgit v1.2.3