[llvm] r358997 - Revert "DebugInfo: Emit only one kind of accelerated access/name table"
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 23 08:03:25 PDT 2019
Author: dblaikie
Date: Tue Apr 23 08:03:24 2019
New Revision: 358997
URL: http://llvm.org/viewvc/llvm-project?rev=358997&view=rev
Log:
Revert "DebugInfo: Emit only one kind of accelerated access/name table"
Regresses some apple_names situations - still investigating.
This reverts commit r358931.
Removed:
llvm/trunk/test/DebugInfo/X86/gnu-names.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=358997&r1=358996&r2=358997&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AccelTable.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AccelTable.cpp Tue Apr 23 08:03:24 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::Default)
+ if (CU.value()->getCUNode()->getNameTableKind() ==
+ DICompileUnit::DebugNameTableKind::None)
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=358997&r1=358996&r2=358997&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Tue Apr 23 08:03:24 2019
@@ -1036,9 +1036,7 @@ bool DwarfCompileUnit::hasDwarfPubSectio
return true;
case DICompileUnit::DebugNameTableKind::Default:
return DD->tuneForGDB() && !includeMinimalInlineScopes() &&
- !CUNode->isDebugDirectivesOnly() &&
- DD->getAccelTableKind() != AccelTableKind::Apple &&
- DD->getDwarfVersion() < 5;
+ !CUNode->isDebugDirectivesOnly();
}
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=358997&r1=358996&r2=358997&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Apr 23 08:03:24 2019
@@ -2764,9 +2764,6 @@ void DwarfDebug::addAccelNameImpl(const
CU.getNameTableKind() == DICompileUnit::DebugNameTableKind::None)
return;
- if (CU.getNameTableKind() == DICompileUnit::DebugNameTableKind::GNU)
- return;
-
DwarfFile &Holder = useSplitDwarf() ? SkeletonHolder : InfoHolder;
DwarfStringPoolEntryRef Ref = Holder.getStringPool().getEntry(*Asm, Name);
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=358997&r1=358996&r2=358997&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/accel-tables.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/accel-tables.ll Tue Apr 23 08:03:24 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=PUB %s
+; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %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=PUB %s
+; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %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,25 +23,15 @@
; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s
; APPLE-NOT: debug_names
-; APPLE-NOT: pubnames
; APPLE: apple_names
; APPLE-NOT: debug_names
-; APPLE-NOT: pubnames
-
-; 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
Removed: llvm/trunk/test/DebugInfo/X86/gnu-names.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/gnu-names.ll?rev=358996&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/gnu-names.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/gnu-names.ll (removed)
@@ -1,74 +0,0 @@
-; 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 -debugger-tune=gdb < %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=GNU %s
-; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %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.
-; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -generate-type-units -debugger-tune=lldb < %s \
-; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s
-
-; Debug types are ignored for non-ELF targets which means it shouldn't affect
-; accelerator table generation.
-; RUN: llc -mtriple=x86_64-apple-darwin12 -generate-type-units -filetype=obj < %s \
-; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s
-
-; APPLE-NOT: debug_names
-; APPLE-NOT: pubnames
-; APPLE: apple_names
-; APPLE-NOT: debug_names
-; APPLE-NOT: pubnames
-
-; 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
-
- at var = thread_local global i32 0, align 4, !dbg !0
-
-; Function Attrs: norecurse nounwind readnone uwtable
-define void @_Z3funv() local_unnamed_addr #0 !dbg !11 {
- ret void, !dbg !14
-}
-
-; Function Attrs: norecurse uwtable
-define weak_odr hidden i32* @_ZTW3var() local_unnamed_addr #1 {
- ret i32* @var
-}
-
-attributes #0 = { norecurse nounwind readnone uwtable }
-attributes #1 = { norecurse uwtable }
-
-!llvm.dbg.cu = !{!2}
-!llvm.module.flags = !{!7, !8, !9}
-!llvm.ident = !{!10}
-
-!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, nameTableKind: GNU)
-!3 = !DIFile(filename: "debugger-tune.cpp", directory: "/tmp")
-!4 = !{}
-!5 = !{!0}
-!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!7 = !{i32 2, !"Dwarf Version", i32 4}
-!8 = !{i32 2, !"Debug Info Version", i32 3}
-!9 = !{i32 1, !"wchar_size", i32 4}
-!10 = !{!"clang version 7.0.0 (trunk 322268) (llvm/trunk 322267)"}
-!11 = distinct !DISubprogram(name: "fun", linkageName: "_Z3funv", scope: !3, file: !3, line: 2, type: !12, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: true, unit: !2, retainedNodes: !4)
-!12 = !DISubroutineType(types: !13)
-!13 = !{null}
-!14 = !DILocation(line: 2, column: 13, scope: !11)
-
More information about the llvm-commits
mailing list