diff options
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 14 | ||||
| -rw-r--r-- | test/DebugInfo/X86/fission-cu.ll | 5 | ||||
| -rw-r--r-- | test/DebugInfo/X86/generate-odr-hash.ll | 1 |
3 files changed, 9 insertions, 11 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 22512e83d7..027f0b89a5 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -2637,13 +2637,6 @@ void DwarfDebug::initSkeletonUnit(const DwarfUnit *U, DIE *Die, NewU->addLocalString(Die, dwarf::DW_AT_GNU_dwo_name, U->getCUNode().getSplitDebugFilename()); - // Relocate to the beginning of the addr_base section, else 0 for the - // beginning of the one for this compile unit. - if (Asm->MAI->doesDwarfUseRelocationsAcrossSections()) - NewU->addSectionLabel(Die, dwarf::DW_AT_GNU_addr_base, DwarfAddrSectionSym); - else - NewU->addSectionOffset(Die, dwarf::DW_AT_GNU_addr_base, 0); - if (!CompilationDir.empty()) NewU->addLocalString(Die, dwarf::DW_AT_comp_dir, CompilationDir); @@ -2668,6 +2661,13 @@ DwarfCompileUnit *DwarfDebug::constructSkeletonCU(const DwarfCompileUnit *CU) { initSkeletonUnit(CU, Die, NewCU); + // Relocate to the beginning of the addr_base section, else 0 for the + // beginning of the one for this compile unit. + if (Asm->MAI->doesDwarfUseRelocationsAcrossSections()) + NewCU->addSectionLabel(Die, dwarf::DW_AT_GNU_addr_base, DwarfAddrSectionSym); + else + NewCU->addSectionOffset(Die, dwarf::DW_AT_GNU_addr_base, 0); + return NewCU; } diff --git a/test/DebugInfo/X86/fission-cu.ll b/test/DebugInfo/X86/fission-cu.ll index f6ea6445f8..1591deee5e 100644 --- a/test/DebugInfo/X86/fission-cu.ll +++ b/test/DebugInfo/X86/fission-cu.ll @@ -26,7 +26,6 @@ ; CHECK: [1] DW_TAG_compile_unit DW_CHILDREN_no ; CHECK: DW_AT_stmt_list DW_FORM_sec_offset ; CHECK: DW_AT_GNU_dwo_name DW_FORM_strp -; CHECK: DW_AT_GNU_addr_base DW_FORM_sec_offset ; CHECK: DW_AT_comp_dir DW_FORM_strp ; CHECK: DW_AT_GNU_dwo_id DW_FORM_data8 @@ -59,8 +58,8 @@ ; CHECK: DW_TAG_compile_unit ; CHECK: DW_AT_stmt_list [DW_FORM_sec_offset] (0x00000000) ; CHECK: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x00000000] = "baz.dwo") -; CHECK: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000000) ; CHECK: DW_AT_comp_dir [DW_FORM_strp] ( .debug_str[0x00000008] = "/usr/local/google/home/echristo/tmp") +; CHECK: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000000) ; CHECK: DW_AT_GNU_dwo_id [DW_FORM_data8] (0x1f1f859683d49324) ; Check that the rest of the compile units have information. @@ -106,8 +105,8 @@ ; OBJ-NEXT: R_X86_64_32 .debug_abbrev ; OBJ-NEXT: R_X86_64_32 .debug_line ; OBJ-NEXT: R_X86_64_32 .debug_str -; OBJ-NEXT: R_X86_64_32 .debug_addr ; OBJ-NEXT: R_X86_64_32 .debug_str +; OBJ-NEXT: R_X86_64_32 .debug_addr ; OBJ-NEXT: } ; HDR-NOT: .debug_aranges diff --git a/test/DebugInfo/X86/generate-odr-hash.ll b/test/DebugInfo/X86/generate-odr-hash.ll index add1e74fde..e713f14c4f 100644 --- a/test/DebugInfo/X86/generate-odr-hash.ll +++ b/test/DebugInfo/X86/generate-odr-hash.ll @@ -77,7 +77,6 @@ ; FISSION-LABEL: type_signature = 0x1d02f3be30cc5688 ; FISSION: DW_TAG_type_unit ; FISSION-NEXT: DW_AT_GNU_dwo_name{{.*}}"bar.dwo" -; FISSION-NEXT: DW_AT_GNU_addr_base ; FISSION-NEXT: DW_AT_comp_dir{{.*}}"/tmp/dbginfo" ; FISSION-NOT: type_signature ; FISSION-LABEL: type_signature = 0xb04af47397402e77 |