Revert "DebugInfo: Emit only one kind of accelerated access/name table"

Regresses some apple_names situations - still investigating.

This reverts commit r358931.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358997 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/AsmPrinter/AccelTable.cpp b/lib/CodeGen/AsmPrinter/AccelTable.cpp
index b5617f46ddde341249f58bda801d8475b3ea46e4..c4eef7ad722b046e3f46e0604a6c8cf6446c2ea6 100644 (file)
--- a/lib/CodeGen/AsmPrinter/AccelTable.cpp
+++ b/lib/CodeGen/AsmPrinter/AccelTable.cpp
@@ -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());

diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index 0a06dfdae06c80a71e534e3bb600b79bc47d8911..c1e8ffec75aedf83a2ee8d6e808f9d5478cf8f74 100644 (file)
--- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -1036,9 +1036,7 @@ bool DwarfCompileUnit::hasDwarfPubSections() const {
     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");
 }

diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 5b0e77b8a06ee9d6a8ac754700b06f08d52df356..b18ee18d7a381db23064dbcb6cf5aced03f034b8 100644 (file)
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2764,9 +2764,6 @@ void DwarfDebug::addAccelNameImpl(const DICompileUnit &CU,
       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);
 

diff --git a/test/DebugInfo/X86/accel-tables.ll b/test/DebugInfo/X86/accel-tables.ll
index 7b0377a1f99afb612848a22d558ad82fbe28fb05..813b66f1aeb6f28f20b0328d2e690647ff465103 100644 (file)
--- a/test/DebugInfo/X86/accel-tables.ll
+++ b/test/DebugInfo/X86/accel-tables.ll
@@ -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
 

diff --git a/test/DebugInfo/X86/gnu-names.ll b/test/DebugInfo/X86/gnu-names.ll
deleted file mode 100644 (file)
index be5e688..0000000
--- a/test/DebugInfo/X86/gnu-names.ll
+++ /dev/null
@@ -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
-
-@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)
-