Remove -generate-dwarf-pub-sections flag.

[pcc]

Summary

This flag is unnecessary for testing because we can get the coverage
we need by adjusting CU attributes.

Depends on D37655

[dblaikie]

llvm/test/DebugInfo/Generic/dwarf-public-names.ll

3 ↗

(On Diff #114739)

I think it'd be better to change the IR to enable gnu-pubnames here (& in other tests where this patch is currently adding -debugger-tune) - makes it more explicit what the purpose is (I mean, yeah, it may get lost in the noise of the debug info metadata... but still)

llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll

2 ↗

(On Diff #114739)

What's this for? Maybe this removes the purpose of this test (it seems to be testing gnu-public-names and gmlt, which is now impossible). Perhaps the test should be deleted?

Though looking at the original commit (r303894) that added this test, maybe there's something to be concerned about that either this patch or the previous one may've regressed.

Probably worth checking if this does work or did work when it was committed, I guess.

[pcc]

llvm/test/DebugInfo/Generic/dwarf-public-names.ll

3 ↗

(On Diff #114739)

I think this test (and the others like it) are intended to cover non-GNU pubnames, though.

llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll

2 ↗

(On Diff #114739)

it seems to be testing gnu-public-names and gmlt, which is now impossible

Actually, I think the change makes non-GNU public-names + gmlt impossible.

Perhaps the test should be deleted?

Removing this line seems fine to me. If the purpose of this test is to test things related to gmlt I guess it wouldn't make sense to disable gmlt.

Probably worth checking if this does work or did work when it was committed, I guess.

It isn't clear to me what you mean by "this". Do you mean whether gold accepts the object file?

[dblaikie]

llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll

2 ↗

(On Diff #114739)

By "this" I mean the functionality committed with/supposedly verified by this test:

"DebugInfo: Produce debug_{gnu_}pub{names,types} entries when explicitly requested, even in -gmlt or when empty"

Though admittedly I was mostly looking at gnu pubnames there, not sure if gold uses non-gnu pubnames for gdb-index or not (I think not). So maybe the original generalization over gnu and non-gnu pubnames isn't important (in which case removing this RUN line and only testing the gnu case would be fine), but it does seem a bit inconsistenty, I guess.

[pcc]

llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll

2 ↗

(On Diff #114739)

Okay, looks like that is being tested for by the first line. I'll go ahead and remove the second line, we can always bring it back if we add a supported way of doing gmlt + non-gnu pubnames.

llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp

 #include <cstdint>
 #include <iterator>
 #include <memory>
 #include <string>
 #include <utility>
 
 using namespace llvm;
 
-enum DefaultOnOff { Default, Enable, Disable };
-
-static cl::opt<DefaultOnOff>
-DwarfPubSections("generate-dwarf-pub-sections", cl::Hidden,
-                 cl::desc("Generate DWARF pubnames and pubtypes sections"),
-                 cl::values(clEnumVal(Default, "Default for platform"),
-                            clEnumVal(Enable, "Enabled"),
-                            clEnumVal(Disable, "Disabled")),
-                 cl::init(Default));
-
 DwarfCompileUnit::DwarfCompileUnit(unsigned UID, const DICompileUnit *Node,
                                    AsmPrinter *A, DwarfDebug *DW,
                                    DwarfFile *DWU)
     : DwarfUnit(dwarf::DW_TAG_compile_unit, Node, A, DW, DWU), UniqueID(UID) {
   insertDIE(Node, &getUnitDie());
   MacroLabelBegin = Asm->createTempSymbol("cu_macro_begin");
 }
 

 }
 
 bool DwarfCompileUnit::hasDwarfPubSections() const {
   // Opting in to GNU Pubnames/types overrides the default to ensure these are
   // generated for things like Gold's gdb_index generation.
   if (CUNode->getGnuPubnames())
     return true;
 
-  if (DwarfPubSections == Default)
-    return DD->tuneForGDB() && !includeMinimalInlineScopes();
-
-  return DwarfPubSections == Enable;
 }
 
 /// addGlobalName - Add a new global name to the compile unit.
 void DwarfCompileUnit::addGlobalName(StringRef Name, const DIE &Die,
                                      const DIScope *Context) {
   if (!hasDwarfPubSections())
     return;
   std::string FullName = getParentContextString(Context) + Name.str();

llvm/trunk/test/DebugInfo/Generic/dwarf-public-names.ll

 ; REQUIRES: object-emission
 
-; RUN: %llc_dwarf -generate-dwarf-pub-sections=Enable -filetype=obj -o %t.o < %s
+; RUN: %llc_dwarf -debugger-tune=gdb -filetype=obj -o %t.o < %s
 ; RUN: llvm-dwarfdump -debug-pubnames %t.o | FileCheck %s
 ; ModuleID = 'dwarf-public-names.cpp'
 ;
 ; Generated from:
 ;
 ; struct C {
 ;   void member_function();
 ;   static int static_member_function();

llvm/trunk/test/DebugInfo/X86/2010-04-13-PubType.ll

-; RUN: llc -O0 -asm-verbose -mtriple=x86_64-macosx -generate-dwarf-pub-sections=Enable < %s | FileCheck %s
+; RUN: llc -O0 -asm-verbose -mtriple=x86_64-macosx -debugger-tune=gdb < %s | FileCheck %s
 ; CHECK-NOT: .asciz "X" ## External Name
 ; CHECK: .asciz "Y" ## External Name
 ; Test to check type with no definition is listed in pubtypes section.
 %struct.X = type opaque
 %struct.Y = type { i32 }
 
 define i32 @foo(%struct.X* %x, %struct.Y* %y) nounwind ssp !dbg !1 {
 entry:

llvm/trunk/test/DebugInfo/X86/c-type-units.ll

 ; REQUIRES: object-emission
 
-; RUN: llc -o - %s -filetype=obj -O0 -generate-dwarf-pub-sections=Disable -generate-type-units -mtriple=x86_64-unknown-linux-gnu | llvm-dwarfdump -debug-types - | FileCheck %s
+; RUN: llc -o - %s -filetype=obj -O0 -debugger-tune=lldb -generate-type-units -mtriple=x86_64-unknown-linux-gnu | llvm-dwarfdump -debug-types - | FileCheck %s
 
 ; struct foo {
 ; } f;
 
 ; no known LLVM frontends produce appropriate unique identifiers for C types,
 ; so we don't produce type units for them
 ; CHECK-NOT: DW_TAG_type_unit
 

llvm/trunk/test/DebugInfo/X86/gnu-public-names-gmlt.ll

-; RUN: sed -e 's/gnuPubnames: false/gnuPubnames: true/' %s | llc -mtriple=x86_64-pc-linux-gnu -filetype=obj | llvm-dwarfdump -v - | FileCheck --check-prefix=GPUB --check-prefix=CHECK %s
-; RUN: llc -mtriple=x86_64-pc-linux-gnu -filetype=obj < %s -generate-dwarf-pub-sections=Enable | llvm-dwarfdump -v - | FileCheck --check-prefix=PUB --check-prefix=CHECK %s
+; RUN: sed -e 's/gnuPubnames: false/gnuPubnames: true/' %s | llc -mtriple=x86_64-pc-linux-gnu -filetype=obj | llvm-dwarfdump -v - | FileCheck --check-prefix=GPUB %s
 ; RUN: llc -mtriple=x86_64-pc-linux-gnu -filetype=obj < %s | llvm-dwarfdump -v - | FileCheck --check-prefix=NONE %s
 
 ; Generated from:
 ;   void f1();
 ;   inline __attribute__((always_inline)) void f2() {
 ;     f1();
 ;   }
 ;   void f3() {
 ;     f2();
 ;   }
 ;   $ clang++ -gmlt %s -emit-llvm -S
 
 ; GPUB: Compile Unit
 ; GPUB: DW_AT_GNU_pubnames
 
 ; GPUB: .debug_gnu_pubnames contents:
-; PUB: .debug_pubnames contents:
-; CHECK-NEXT: unit_offset = 0x00000000
-; CHECK-NEXT: Name
-; CHECK-NEXT: "f2"
-; CHECK-NEXT: "f3"
+; GPUB-NEXT: unit_offset = 0x00000000
+; GPUB-NEXT: Name
+; GPUB-NEXT: "f2"
+; GPUB-NEXT: "f3"
 
 ; GPUB: .debug_gnu_pubtypes contents:
-; PUB: .debug_pubtypes contents:
-; CHECK-NEXT: length = 0x0000000e version = 0x0002 unit_offset = 0x00000000
-; CHECK-NEXT: Name
+; GPUB-NEXT: length = 0x0000000e version = 0x0002 unit_offset = 0x00000000
+; GPUB-NEXT: Name
 
 ; NONE: .debug_pubnames contents:
 ; NONE: {{^$}}
 ; NONE: .debug_pubtypes contents:
 ; NONE: {{^$}}
 ; NONE: .debug_gnu_pubnames contents:
 ; NONE: {{^$}}
 ; NONE: .debug_gnu_pubtypes contents: