From a4c30d6509260cce67904710bccb3cd07d396971 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Mon, 12 Jan 2015 23:36:56 +0000 Subject: Make DwarfExpression store the AsmPrinter instead of the TargetMachine. NFC. llvm-svn: 225731 --- llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp') diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp index 89987953580..99a9205b8b2 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -49,8 +49,8 @@ class DIEDwarfExpression : public DwarfExpression { DwarfUnit &DU; DIELoc ¨ public: - DIEDwarfExpression(TargetMachine &TM, DwarfUnit &DU, DIELoc &DIE) - : DwarfExpression(TM), DU(DU), DIE(DIE) {} + DIEDwarfExpression(const AsmPrinter &AP, DwarfUnit &DU, DIELoc &DIE) + : DwarfExpression(AP), DU(DU), DIE(DIE) {} void EmitOp(uint8_t Op, const char* Comment = nullptr) override; void EmitSigned(int Value) override; @@ -68,8 +68,7 @@ void DIEDwarfExpression::EmitUnsigned(unsigned Value) { DU.addUInt(DIE, dwarf::DW_FORM_udata, Value); } unsigned DIEDwarfExpression::getFrameRegister() { - const TargetRegisterInfo *TRI = TM.getSubtargetImpl()->getRegisterInfo(); - return TRI->getFrameRegister(*DU.getAsmPrinter()->MF); + return getTRI()->getFrameRegister(*AP.MF); } @@ -431,7 +430,7 @@ void DwarfUnit::addSourceLine(DIE &Die, DINameSpace NS) { /// addRegisterOp - Add register operand. bool DwarfUnit::addRegisterOpPiece(DIELoc &TheDie, unsigned Reg, unsigned SizeInBits, unsigned OffsetInBits) { - DIEDwarfExpression Expr(Asm->TM, *this, TheDie); + DIEDwarfExpression Expr(*Asm, *this, TheDie); Expr.AddMachineRegPiece(Reg, SizeInBits, OffsetInBits); return true; } @@ -439,7 +438,7 @@ bool DwarfUnit::addRegisterOpPiece(DIELoc &TheDie, unsigned Reg, /// addRegisterOffset - Add register offset. bool DwarfUnit::addRegisterOffset(DIELoc &TheDie, unsigned Reg, int64_t Offset) { - DIEDwarfExpression Expr(Asm->TM, *this, TheDie); + DIEDwarfExpression Expr(*Asm, *this, TheDie); return Expr.AddMachineRegIndirect(Reg, Offset); } -- cgit v1.2.3