[llvm] r359026 - Reapply: "DebugInfo: Emit only one kind of accelerated access/name table""
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 23 12:00:45 PDT 2019
Author: dblaikie
Date: Tue Apr 23 12:00:45 2019
New Revision: 359026
URL: http://llvm.org/viewvc/llvm-project?rev=359026&view=rev
Log:
Reapply: "DebugInfo: Emit only one kind of accelerated access/name table""
Originally committed in r358931
Reverted in r358997
Seems this change made Apple accelerator tables miss names (because
names started respecting the CU NameTableKind GNU & assuming that
shouldn't produce accelerated names too), which is never correct (apple
accelerator tables don't have separators or CU lists - if present, they
must describe all names in all CUs).
Original Description:
Currently to opt in to debug_names in DWARFv5, the IR must contain
'nameTableKind: Default' which also enables debug_pubnames.
Instead, only allow one of {debug_names, apple_names, debug_pubnames,
debug_gnu_pubnames}.
nameTableKind: Default gives debug_names in DWARFv5 and greater,
debug_pubnames in v4 and earlier - and apple_names when tuning for lldb
on MachO.
nameTableKind: GNU always gives gnu_pubnames
Added:
llvm/trunk/test/DebugInfo/X86/gnu-names.ll
- copied, changed from r358997, llvm/trunk/test/DebugInfo/X86/accel-tables.ll
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/AccelTable.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
llvm/trunk/test/DebugInfo/X86/accel-tables.ll
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AccelTable.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AccelTable.cpp?rev=359026&r1=359025&r2=359026&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AccelTable.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AccelTable.cpp Tue Apr 23 12:00:45 2019
@@ -555,8 +555,8 @@ void llvm::emitDWARF5AccelTable(
SmallVector<unsigned, 1> CUIndex(CUs.size());
int Count = 0;
for (const auto &CU : enumerate(CUs)) {
- if (CU.value()->getCUNode()->getNameTableKind() ==
- DICompileUnit::DebugNameTableKind::None)
+ if (CU.value()->getCUNode()->getNameTableKind() !=
+ DICompileUnit::DebugNameTableKind::Default)
continue;
CUIndex[CU.index()] = Count++;
assert(CU.index() == CU.value()->getUniqueID());
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=359026&r1=359025&r2=359026&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Tue Apr 23 12:00:45 2019
@@ -1036,7 +1036,9 @@ bool DwarfCompileUnit::hasDwarfPubSectio
return true;
case DICompileUnit::DebugNameTableKind::Default:
return DD->tuneForGDB() && !includeMinimalInlineScopes() &&
- !CUNode->isDebugDirectivesOnly();
+ !CUNode->isDebugDirectivesOnly() &&
+ DD->getAccelTableKind() != AccelTableKind::Apple &&
+ DD->getDwarfVersion() < 5;
}
llvm_unreachable("Unhandled DICompileUnit::DebugNameTableKind enum");
}
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=359026&r1=359025&r2=359026&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Apr 23 12:00:45 2019
@@ -2761,7 +2761,7 @@ void DwarfDebug::addAccelNameImpl(const
return;
if (getAccelTableKind() != AccelTableKind::Apple &&
- CU.getNameTableKind() == DICompileUnit::DebugNameTableKind::None)
+ CU.getNameTableKind() != DICompileUnit::DebugNameTableKind::Default)
return;
DwarfFile &Holder = useSplitDwarf() ? SkeletonHolder : InfoHolder;
Modified: llvm/trunk/test/DebugInfo/X86/accel-tables.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/accel-tables.ll?rev=359026&r1=359025&r2=359026&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/accel-tables.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/accel-tables.ll Tue Apr 23 12:00:45 2019
@@ -4,11 +4,11 @@
; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s \
; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s
; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -debugger-tune=gdb < %s \
-; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s
+; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=PUB %s
; Linux does has debug_names tables only if we explicitly tune for lldb
; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj < %s \
-; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s
+; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=PUB %s
; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %s \
; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s
@@ -23,15 +23,25 @@
; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s
; APPLE-NOT: debug_names
+; APPLE-NOT: debug{{.*}}pub
; APPLE: apple_names
; APPLE-NOT: debug_names
+; APPLE-NOT: debug{{.*}}pub
+
+; PUB-NOT: apple_names
+; PUB-NOT: debug_names
+; PUB: pubnames
+; PUB-NOT: apple_names
+; PUB-NOT: debug_names
; NONE-NOT: apple_names
; NONE-NOT: debug_names
; DEBUG_NAMES-NOT: apple_names
+; DEBUG_NAMES-NOT: pubnames
; DEBUG_NAMES: debug_names
; DEBUG_NAMES-NOT: apple_names
+; DEBUG_NAMES-NOT: pubnames
@var = thread_local global i32 0, align 4, !dbg !0
Copied: llvm/trunk/test/DebugInfo/X86/gnu-names.ll (from r358997, llvm/trunk/test/DebugInfo/X86/accel-tables.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/gnu-names.ll?p2=llvm/trunk/test/DebugInfo/X86/gnu-names.ll&p1=llvm/trunk/test/DebugInfo/X86/accel-tables.ll&r1=358997&r2=359026&rev=359026&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/accel-tables.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/gnu-names.ll Tue Apr 23 12:00:45 2019
@@ -1,16 +1,17 @@
; Verify the emission of accelerator tables for various targets for the DWARF<=4 case
; Darwin has the apple tables unless we specifically tune for gdb
-; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s \
-; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s
+; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s > %t
+; RUN: llvm-readobj -sections %t | FileCheck --check-prefix=APPLE %s
+; RUN: llvm-dwarfdump -apple-names %t | FileCheck --check-prefix=APPLE-NAMES %s
; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -debugger-tune=gdb < %s \
-; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s
+; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=GNU %s
; Linux does has debug_names tables only if we explicitly tune for lldb
; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj < %s \
-; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s
+; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=GNU %s
; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %s \
-; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s
+; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=GNU %s
; No accelerator tables if type units are enabled, as DWARF v4 type units are
; not compatible with accelerator tables.
@@ -23,15 +24,22 @@
; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s
; APPLE-NOT: debug_names
+; APPLE-NOT: debug{{.*}}pub
; APPLE: apple_names
; APPLE-NOT: debug_names
+; APPLE: debug{{.*}}pub
+
+; APPLE-NAMES: Hashes count: 3
+
+; GNU-NOT: apple_names
+; GNU-NOT: debug_names
+; GNU: gnu_pub
+; GNU-NOT: apple_names
+; GNU-NOT: debug_names
; NONE-NOT: apple_names
; NONE-NOT: debug_names
-
-; DEBUG_NAMES-NOT: apple_names
-; DEBUG_NAMES: debug_names
-; DEBUG_NAMES-NOT: apple_names
+; NONE: debug_gnu_pub
@var = thread_local global i32 0, align 4, !dbg !0
@@ -54,7 +62,7 @@ attributes #1 = { norecurse uwtable }
!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
!1 = distinct !DIGlobalVariable(name: "var", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
-!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !3, producer: "clang version 7.0.0 (trunk 322268) (llvm/trunk 322267)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !3, producer: "clang version 7.0.0 (trunk 322268) (llvm/trunk 322267)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: GNU)
!3 = !DIFile(filename: "debugger-tune.cpp", directory: "/tmp")
!4 = !{}
!5 = !{!0}
More information about the llvm-commits
mailing list