From 3842b94c4e7292de5f9e368bd60c64fc084c1bbe Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Thu, 31 Oct 2019 17:58:15 +0000 Subject: Revert rG57ee0435bd47f23f3939f402914c231b4f65ca5e - [TII] Use optional destination and source pair as a return value; NFC This is breaking MSVC builds: http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/20375 --- llvm/lib/CodeGen/TargetInstrInfo.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'llvm/lib/CodeGen/TargetInstrInfo.cpp') diff --git a/llvm/lib/CodeGen/TargetInstrInfo.cpp b/llvm/lib/CodeGen/TargetInstrInfo.cpp index f5f53b50ab8..88fbfcb7784 100644 --- a/llvm/lib/CodeGen/TargetInstrInfo.cpp +++ b/llvm/lib/CodeGen/TargetInstrInfo.cpp @@ -1124,13 +1124,14 @@ 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 (auto DestSrc = isCopyInstr(MI)) { - return ParamLoadedValue(DestSrc->Source, Expr); - } else if (auto DestSrc = isAddImmediate(MI, Offset)) { + if (isCopyInstr(MI, SrcRegOp, DestRegOp)) { + return ParamLoadedValue(*SrcRegOp, Expr); + } else if (isAddImmediate(MI, DestRegOp, SrcRegOp, Offset)) { Expr = DIExpression::prepend(Expr, DIExpression::ApplyOffset, Offset); - return ParamLoadedValue(DestSrc->Source, Expr); + return ParamLoadedValue(*SrcRegOp, Expr); } return None; -- cgit v1.2.3