diff options
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DIE.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 2 | ||||
| -rw-r--r-- | test/FrontendC/2010-06-28-DbgEntryPC.c | 48 |
3 files changed, 51 insertions, 1 deletions
diff --git a/lib/CodeGen/AsmPrinter/DIE.cpp b/lib/CodeGen/AsmPrinter/DIE.cpp index b2c70d51f5..21396ca37f 100644 --- a/lib/CodeGen/AsmPrinter/DIE.cpp +++ b/lib/CodeGen/AsmPrinter/DIE.cpp @@ -201,6 +201,7 @@ void DIEInteger::EmitValue(AsmPrinter *Asm, unsigned Form) const { case dwarf::DW_FORM_data8: Size = 8; break; case dwarf::DW_FORM_udata: Asm->EmitULEB128(Integer); return; case dwarf::DW_FORM_sdata: Asm->EmitSLEB128(Integer); return; + case dwarf::DW_FORM_addr: Size = Asm->getTargetData().getPointerSize(); break; default: llvm_unreachable("DIE Value form not supported yet"); } Asm->OutStreamer.EmitIntValue(Integer, Size, 0/*addrspace*/); @@ -221,6 +222,7 @@ unsigned DIEInteger::SizeOf(AsmPrinter *AP, unsigned Form) const { case dwarf::DW_FORM_data8: return sizeof(int64_t); case dwarf::DW_FORM_udata: return MCAsmInfo::getULEB128Size(Integer); case dwarf::DW_FORM_sdata: return MCAsmInfo::getSLEB128Size(Integer); + case dwarf::DW_FORM_addr: return AP->getTargetData().getPointerSize(); default: llvm_unreachable("DIE Value form not supported yet"); break; } return 0; diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 9ff929f0b1..2a25cb9101 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -1792,7 +1792,7 @@ void DwarfDebug::constructCompileUnit(const MDNode *N) { addString(Die, dwarf::DW_AT_name, dwarf::DW_FORM_string, FN); // Use DW_AT_entry_pc instead of DW_AT_low_pc/DW_AT_high_pc pair. This // simplifies debug range entries. - addUInt(Die, dwarf::DW_AT_entry_pc, dwarf::DW_FORM_data4, 0); + addUInt(Die, dwarf::DW_AT_entry_pc, dwarf::DW_FORM_addr, 0); // DW_AT_stmt_list is a offset of line number information for this // compile unit in debug_line section. It is always zero when only one // compile unit is emitted in one object file. diff --git a/test/FrontendC/2010-06-28-DbgEntryPC.c b/test/FrontendC/2010-06-28-DbgEntryPC.c new file mode 100644 index 0000000000..9ce236425a --- /dev/null +++ b/test/FrontendC/2010-06-28-DbgEntryPC.c @@ -0,0 +1,48 @@ +// RUN: %llvmgcc -S -O2 -g %s -o - | llc -O2 | FileCheck %s +// Use DW_FORM_addr for DW_AT_entry_pc. +// Radar 8094785 + +// CHECK: .byte 17 ## DW_TAG_compile_unit +// CHECK-NEXT: .byte 1 ## DW_CHILDREN_yes +// CHECK-NEXT: .byte 37 ## DW_AT_producer +// CHECK-NEXT: .byte 8 ## DW_FORM_string +// CHECK-NEXT: .byte 19 ## DW_AT_language +// CHECK-NEXT: .byte 11 ## DW_FORM_data1 +// CHECK-NEXT: .byte 3 ## DW_AT_name +// CHECK-NEXT: .byte 8 ## DW_FORM_string +// CHECK-NEXT: .byte 82 ## DW_AT_entry_pc +// CHECK-NEXT: .byte 1 ## DW_FORM_addr +// CHECK-NEXT: .byte 16 ## DW_AT_stmt_list +// CHECK-NEXT: .byte 6 ## DW_FORM_data4 +// CHECK-NEXT: .byte 27 ## DW_AT_comp_dir +// CHECK-NEXT: .byte 8 ## DW_FORM_string +// CHECK-NEXT: .byte 225 ## DW_AT_APPLE_optimized + +struct a { + int c; + struct a *d; +}; + +int ret; + +void foo(int x) __attribute__((noinline)); +void *bar(struct a *b) __attribute__((noinline)); + +void foo(int x) +{ + ret = x; +} + +void *bar(struct a *b) { + foo(b->c); + return b; +} + +int main(int argc, char *argv[]) { + struct a e; + e.c = 4; + e.d = &e; + + (void)bar(&e); + return ret; +} |