diff options
| author | Manman Ren <mren@apple.com> | 2013-04-04 23:13:11 +0000 |
|---|---|---|
| committer | Manman Ren <mren@apple.com> | 2013-04-04 23:13:11 +0000 |
| commit | 624a93ee47fd05adbad4ea22b50c554ca23ac0ef (patch) | |
| tree | a832b8f0b47c514ea0b2a73fa6ba8a644af2ab79 /lib | |
| parent | 2e892e4e27ecb6b1af757796841db5ff18df99a9 (diff) | |
| download | llvm-624a93ee47fd05adbad4ea22b50c554ca23ac0ef.tar.gz llvm-624a93ee47fd05adbad4ea22b50c554ca23ac0ef.tar.bz2 llvm-624a93ee47fd05adbad4ea22b50c554ca23ac0ef.tar.xz | |
Debug Info: revert 178722 for now.
There is a difference for FORM_ref_addr between DWARF 2 and DWARF 3+.
Since Eric is against guarding DWARF 2 ref_addr with DarwinGDBCompat, we are
still in discussion on how to handle this.
The correct solution is to update our header to say version 4 instead of version
2 and update tool chains as well.
rdar://problem/13559431
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178806 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DIE.cpp | 6 | ||||
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DIE.h | 4 | ||||
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 9 |
3 files changed, 4 insertions, 15 deletions
diff --git a/lib/CodeGen/AsmPrinter/DIE.cpp b/lib/CodeGen/AsmPrinter/DIE.cpp index 326fbe5567..57e0acda89 100644 --- a/lib/CodeGen/AsmPrinter/DIE.cpp +++ b/lib/CodeGen/AsmPrinter/DIE.cpp @@ -310,12 +310,6 @@ void DIEEntry::EmitValue(AsmPrinter *AP, unsigned Form) const { AP->EmitInt32(Entry->getOffset()); } -unsigned DIEEntry::SizeOf(AsmPrinter *AP, unsigned Form) const { - if (Form == dwarf::DW_FORM_ref_addr) - return AP->getDataLayout().getPointerSize(); - return sizeof(int32_t); -} - #ifndef NDEBUG void DIEEntry::print(raw_ostream &O) { O << format("Die: 0x%lx", (long)(intptr_t)Entry); diff --git a/lib/CodeGen/AsmPrinter/DIE.h b/lib/CodeGen/AsmPrinter/DIE.h index 8d68fd595f..c332aa2a7d 100644 --- a/lib/CodeGen/AsmPrinter/DIE.h +++ b/lib/CodeGen/AsmPrinter/DIE.h @@ -336,7 +336,9 @@ namespace llvm { /// SizeOf - Determine size of debug information entry in bytes. /// - virtual unsigned SizeOf(AsmPrinter *AP, unsigned Form) const; + virtual unsigned SizeOf(AsmPrinter *AP, unsigned Form) const { + return sizeof(int32_t); + } // Implement isa/cast/dyncast. static bool classof(const DIEValue *E) { return E->getType() == isEntry; } diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index b6b0bb1237..d3cb4f9c1c 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -1791,14 +1791,7 @@ void DwarfDebug::emitDIE(DIE *Die, std::vector<DIEAbbrev *> *Abbrevs) { DwarfUnits &Holder = useSplitDwarf() ? SkeletonHolder : InfoHolder; Addr += Holder.getCUOffset(Origin->getCompileUnit()); } - // DWARF4: References that use the attribute form DW_FORM_ref_addr are - // specified to be four bytes in the DWARF 32-bit format and eight bytes - // in the DWARF 64-bit format, while DWARF Version 2 specifies that such - // references have the same size as an address on the target system. - // Our current version is version 2. - Asm->OutStreamer.EmitIntValue(Addr, - Form == dwarf::DW_FORM_ref_addr ? - Asm->getDataLayout().getPointerSize() : 4); + Asm->EmitInt32(Addr); break; } case dwarf::DW_AT_ranges: { |