maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Revert "For the dwarf expression code get the subtarget off of the current"" 

This reapplies r230990 without modifications.

llvm-svn: 231024
This commit is contained in:
Adrian Prantl 2015-03-02 22:02:36 +00:00
parent 92da14b244
commit b846acc6c6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp
View File

@ -16,6 +16,7 @@
#include "DwarfExpression.h" #include "DwarfExpression.h"
#include "llvm/ADT/Twine.h" #include "llvm/ADT/Twine.h"
#include "llvm/CodeGen/AsmPrinter.h" #include "llvm/CodeGen/AsmPrinter.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/MachineModuleInfo.h"
#include "llvm/IR/DataLayout.h" #include "llvm/IR/DataLayout.h"
#include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCAsmInfo.h"
@ -191,7 +192,7 @@ void AsmPrinter::EmitSectionOffset(const MCSymbol *Label,
/// EmitDwarfRegOp - Emit dwarf register operation. /// EmitDwarfRegOp - Emit dwarf register operation.
void AsmPrinter::EmitDwarfRegOp(ByteStreamer &Streamer, void AsmPrinter::EmitDwarfRegOp(ByteStreamer &Streamer,
const MachineLocation &MLoc) const { const MachineLocation &MLoc) const {
DebugLocDwarfExpression Expr(*TM.getSubtargetImpl()->getRegisterInfo(), DebugLocDwarfExpression Expr(*MF->getSubtarget().getRegisterInfo(),
getDwarfDebug()->getDwarfVersion(), Streamer); getDwarfDebug()->getDwarfVersion(), Streamer);
const MCRegisterInfo *MRI = MMI->getContext().getRegisterInfo(); const MCRegisterInfo *MRI = MMI->getContext().getRegisterInfo();
int Reg = MRI->getDwarfRegNum(MLoc.getReg(), false); int Reg = MRI->getDwarfRegNum(MLoc.getReg(), false);

7
llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
View File

@ -17,6 +17,7 @@
#include "DwarfDebug.h" #include "DwarfDebug.h"
#include "DwarfExpression.h" #include "DwarfExpression.h"
#include "llvm/ADT/APFloat.h" #include "llvm/ADT/APFloat.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/IR/Constants.h" #include "llvm/IR/Constants.h"
#include "llvm/IR/DIBuilder.h" #include "llvm/IR/DIBuilder.h"
#include "llvm/IR/DataLayout.h" #include "llvm/IR/DataLayout.h"
@ -43,9 +44,9 @@ GenerateDwarfTypeUnits("generate-type-units", cl::Hidden,
cl::desc("Generate DWARF4 type units."), cl::desc("Generate DWARF4 type units."),
cl::init(false)); cl::init(false));
DIEDwarfExpression::DIEDwarfExpression(const AsmPrinter &AP, DIEDwarfExpression::DIEDwarfExpression(const AsmPrinter &AP, DwarfUnit &DU,
DwarfUnit &DU, DIELoc &DIE) DIELoc &DIE)
: DwarfExpression(*AP.TM.getSubtargetImpl()->getRegisterInfo(), : DwarfExpression(*AP.MF->getSubtarget().getRegisterInfo(),
AP.getDwarfDebug()->getDwarfVersion()), AP.getDwarfDebug()->getDwarfVersion()),
AP(AP), DU(DU), DIE(DIE) {} AP(AP), DU(DU), DIE(DIE) {}