diff options
| -rw-r--r-- | llvm/include/llvm/CodeGen/TargetInstrInfo.h | 2 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 8 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/TargetInstrInfo.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86InstrInfo.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/llvm/include/llvm/CodeGen/TargetInstrInfo.h b/llvm/include/llvm/CodeGen/TargetInstrInfo.h index 23a6077f17e..9384bbcca33 100644 --- a/llvm/include/llvm/CodeGen/TargetInstrInfo.h +++ b/llvm/include/llvm/CodeGen/TargetInstrInfo.h @@ -60,7 +60,7 @@ class TargetSubtargetInfo; template <class T> class SmallVectorImpl; -using ParamLoadedValue = std::pair<const MachineOperand*, DIExpression*>; +using ParamLoadedValue = std::pair<MachineOperand, DIExpression*>; //--------------------------------------------------------------------------- /// diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 371ee3a7e16..5f02fab7a80 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -655,12 +655,12 @@ static void collectCallSiteParameters(const MachineInstr *CallMI, unsigned Reg = Defs[0]; if (auto ParamValue = TII->describeLoadedValue(*I)) { - if (ParamValue->first->isImm()) { - unsigned Val = ParamValue->first->getImm(); + if (ParamValue->first.isImm()) { + unsigned Val = ParamValue->first.getImm(); DbgValueLoc DbgLocVal(ParamValue->second, Val); finishCallSiteParam(DbgLocVal, Reg); - } else if (ParamValue->first->isReg()) { - Register RegLoc = ParamValue->first->getReg(); + } else if (ParamValue->first.isReg()) { + Register RegLoc = ParamValue->first.getReg(); unsigned SP = TLI->getStackPointerRegisterToSaveRestore(); Register FP = TRI->getFrameRegister(*MF); bool IsSPorFP = (RegLoc == SP) || (RegLoc == FP); diff --git a/llvm/lib/CodeGen/TargetInstrInfo.cpp b/llvm/lib/CodeGen/TargetInstrInfo.cpp index e64c67f6240..0406649345b 100644 --- a/llvm/lib/CodeGen/TargetInstrInfo.cpp +++ b/llvm/lib/CodeGen/TargetInstrInfo.cpp @@ -1129,10 +1129,10 @@ TargetInstrInfo::describeLoadedValue(const MachineInstr &MI) const { if (isCopyInstr(MI, SrcRegOp, DestRegOp)) { Op = SrcRegOp; - return ParamLoadedValue(Op, Expr); + return ParamLoadedValue(*Op, Expr); } else if (MI.isMoveImmediate()) { Op = &MI.getOperand(1); - return ParamLoadedValue(Op, Expr); + return ParamLoadedValue(*Op, Expr); } else if (MI.hasOneMemOperand()) { int64_t Offset; const auto &TRI = MF->getSubtarget().getRegisterInfo(); @@ -1144,7 +1144,7 @@ TargetInstrInfo::describeLoadedValue(const MachineInstr &MI) const { Expr = DIExpression::prepend(Expr, DIExpression::DerefAfter, Offset); Op = BaseOp; - return ParamLoadedValue(Op, Expr); + return ParamLoadedValue(*Op, Expr); } return None; diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp index bf7dcb232b8..7657db76915 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.cpp +++ b/llvm/lib/Target/X86/X86InstrInfo.cpp @@ -7545,7 +7545,7 @@ X86InstrInfo::describeLoadedValue(const MachineInstr &MI) const { DIExpression::appendOffset(Ops, Offset); Expr = DIExpression::get(MI.getMF()->getFunction().getContext(), Ops); - return ParamLoadedValue(Op, Expr);; + return ParamLoadedValue(*Op, Expr);; } default: return TargetInstrInfo::describeLoadedValue(MI); |
