6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-31 08:16:47 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This reverts commit r201380 for now while we investigate.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201389 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher
2014-02-14 05:33:16 +00:00
parent f46135e47f
commit 89eb5dc65d
4 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -756,6 +756,9 @@ 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,8 +379,7 @@ 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().getMCLineTableSymbols().empty() || if (getContext().hasDwarfFiles())
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,14 +125,6 @@
; 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:

20
test/DebugInfo/empty.ll
View File

@@ -1,20 +0,0 @@
; RUN: llc %s -o %t -filetype=obj
; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s
; *-win32 doesn't emit Dwarf line table.
; XFAIL: win32
; 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}