6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

DebugInfo: Don't include the name of the CU file in the line table file list when it's unneeded

Browse Source 
Recommitting r201380 (reverted in r201389)
Recommitting r201351 and r201355 (reverted in r201351 and r201355)

We weren't emitting the an empty (header only) line table when the line
table was empty - this made the DWARF invalid (the compile unit would
point to the zero-size debug_lines section where there should've been an
empty line table but there was nothing at all). Fix that, and as a
consequence this works around/addresses PR18809.

Also, we emit a non-empty line table to workaround a darwin linker bug,
so XFAILing on darwin too.

Also, mark the test as 'REQUIRES: object-emission' because it does.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201429 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2014-02-14 19:51:35 +00:00
parent 837c54fa7b
commit c4e1b13b08
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -756,9 +756,6 @@ DwarfCompileUnit *DwarfDebug::constructDwarfCompileUnit(DICompileUnit DIUnit) {
InfoHolder.addUnit(NewCU); InfoHolder.addUnit(NewCU);
FileIDCUMap[NewCU->getUniqueID()] = 0; FileIDCUMap[NewCU->getUniqueID()] = 0;
// Call this to emit a .file directive if it wasn't emitted for the source
// file this CU comes from yet.
getOrCreateSourceID(FN, CompilationDir, NewCU->getUniqueID());
NewCU->addString(Die, dwarf::DW_AT_producer, DIUnit.getProducer()); NewCU->addString(Die, dwarf::DW_AT_producer, DIUnit.getProducer());
NewCU->addUInt(Die, dwarf::DW_AT_language, dwarf::DW_FORM_data2, NewCU->addUInt(Die, dwarf::DW_AT_language, dwarf::DW_FORM_data2,

3
lib/MC/MCObjectStreamer.cpp
View File

@ -379,7 +379,8 @@ void MCObjectStreamer::EmitZeros(uint64_t NumBytes) {
void MCObjectStreamer::FinishImpl() { void MCObjectStreamer::FinishImpl() {
// Dump out the dwarf file & directory tables and line tables. // Dump out the dwarf file & directory tables and line tables.
const MCSymbol *LineSectionSymbol = NULL; const MCSymbol *LineSectionSymbol = NULL;
if (getContext().hasDwarfFiles()) if (!getContext().getMCLineTableSymbols().empty() ||
getContext().hasDwarfFiles())
LineSectionSymbol = MCDwarfFileTable::Emit(this); LineSectionSymbol = MCDwarfFileTable::Emit(this);
// If we are generating dwarf for assembly source files dump out the sections. // If we are generating dwarf for assembly source files dump out the sections.

8
test/DebugInfo/X86/generate-odr-hash.ll
View File

@ -125,6 +125,14 @@
; CHECK: DW_TAG_member ; CHECK: DW_TAG_member
; CHECK-NEXT: DW_AT_name{{.*}}"a" ; CHECK-NEXT: DW_AT_name{{.*}}"a"
; CHECK-LABEL: .debug_line contents:
; CHECK: Line table prologue
; CHECK-NOT: file_names[
; CHECK: file_names{{.*}} bar.h
; CHECK: file_names{{.*}} bar.cpp
; CHECK-NOT: file_names[
; CHECK-LABEL: .debug_str contents:
; Use the unit size as a rough hash/identifier for the unit we're dealing with ; Use the unit size as a rough hash/identifier for the unit we're dealing with
; it happens to be unambiguous at the moment, but it's hardly ideal. ; it happens to be unambiguous at the moment, but it's hardly ideal.
; CHECK-LABEL: .debug_pubtypes contents: ; CHECK-LABEL: .debug_pubtypes contents:

23
test/DebugInfo/empty.ll Normal file
View File

@ -0,0 +1,23 @@
; REQUIRES: object-emission
; RUN: llc %s -o %t -filetype=obj
; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s
; *-win32 doesn't emit Dwarf line table.
; darwin has a workaround for a linker bug so it always emits one line table entry
; XFAIL: win32, darwin
; Expect no line table entry since there are no functions and file references in this compile unit
; CHECK: .debug_line contents:
; CHECK: Line table prologue:
; CHECK: total_length: 0x00000019
; CHECK-NOT: file_names[
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!5}
!0 = metadata !{i32 720913, metadata !4, i32 12, metadata !"clang version 3.1 (trunk 143523)", i1 true, metadata !"", i32 0, metadata !2, metadata !2, metadata !2, metadata !2, null, metadata !""} ; [ DW_TAG_compile_unit ]
!2 = metadata !{}
!3 = metadata !{i32 786473, metadata !4} ; [ DW_TAG_file_type ]
!4 = metadata !{metadata !"empty.c", metadata !"/home/nlewycky"}
!5 = metadata !{i32 1, metadata !"Debug Info Version", i32 1}