[llvm-objdump] Support llvm-objdump -sj.foo

[rupprecht]

Summary

r354375 added support for most objdump groupings, but didn't add support for -j|--sections, because that wasn't possible.
r355185 supported values for grouped options.

This just puts the two of them together. This supports -j in modes like -s -j .foo, -sj .foo, -sj=.foo, or -sj.foo.

[jhenderson]

LGTM. I imagine that there might be more options like this, both in llvm-objdump and the other tools?

llvm/test/tools/llvm-objdump/section-filter.test

1

While you're modifying this test, would you mind normalising its use of '//' versus '#'? I actually don't think you need either, since nothing is using this file as an input apart from FileCheck, but I don't mind using one, as long as it's the same one.

[ikudrin]

LGTM.

[rupprecht]

• Use // comments consistently

[rupprecht]

In D59618#1437591, @jhenderson wrote:

LGTM. I imagine that there might be more options like this, both in llvm-objdump and the other tools?

The only other alias in objdump that doesn't map to opt<bool> is --dissassembler-options (or -M), which is also a list<string>, so that should be fine to also include, although it's also comma delimited (-j is not), so I'll have to double check that it still works fine.

Ack - I'll also look to see if other tools need this, in a separate patch.

[rupprecht]

• Also allow grouping of --disassembler-options

llvm/test/tools/llvm-objdump/ARM/reg-names.s

 @ RUN: llvm-mc %s -triple armv5-unknown-linux -filetype=obj -o %t
 @ RUN: llvm-objdump -d %t | FileCheck -check-prefix=STD %s
 @ RUN: llvm-objdump -d -Mreg-names-std %t \
 @ RUN:   | FileCheck -check-prefix=STD %s
 @ RUN: llvm-objdump -d --disassembler-options=reg-names-raw %t \
 @ RUN:   | FileCheck -check-prefix=RAW %s
 @ RUN: llvm-objdump -d -Mreg-names-raw,reg-names-std %t \
 @ RUN:   | FileCheck -check-prefix=STD %s
 @ RUN: llvm-objdump -d -Mreg-names-std,reg-names-raw %t \
 @ RUN:   | FileCheck -check-prefix=RAW %s
 @ RUN: not llvm-objdump -d -Munknown %t 2>&1 \
 @ RUN:   | FileCheck -check-prefix=ERR %s
 @ ERR: Unrecognized disassembler option: unknown
 
+@ Test that the -M alias can be used flexibly. Create a baseline and ensure
+@ all other combinations are identical.
+@ RUN: llvm-objdump -d --disassembler-options=reg-names-raw %t > %t.raw
+@ RUN: llvm-objdump -d -M reg-names-raw %t > %t.1
+@ RUN: llvm-objdump -d -Mreg-names-raw %t > %t.2
+@ RUN: llvm-objdump -d -Mreg-names-std -Mreg-names-raw %t > %t.3
+@ RUN: llvm-objdump -d -Mreg-names-std,reg-names-raw %t > %t.4
+@ RUN: llvm-objdump -dM reg-names-std,reg-names-raw %t > %t.5
+@ RUN: llvm-objdump -dMreg-names-std,reg-names-raw %t > %t.6
+@ RUN: llvm-objdump -dMreg-names-std -Mreg-names-raw %t > %t.7
+@ RUN: cmp %t.raw %t.1
+@ RUN: cmp %t.raw %t.2
+@ RUN: cmp %t.raw %t.3
+@ RUN: cmp %t.raw %t.4
+@ RUN: cmp %t.raw %t.5
+@ RUN: cmp %t.raw %t.6
+@ RUN: cmp %t.raw %t.7
+
 .text
   add r13, r14, r15
 @ STD: add sp, lr, pc
 @ RAW: add r13, r14, r15

llvm/test/tools/llvm-objdump/section-filter.test

-// This test checks that --section works correctly
+// This test checks that --section works correctly.
 // RUN: llvm-objdump -h %p/Inputs/section-filter.obj -j=.text \
 // RUN: --section=.bss | FileCheck %s
 
-# CHECK: .text
-# CHECK-NOT: .data
-# CHECK: .bss
+// CHECK: .text
+// CHECK-NOT: .data
+// CHECK: .bss
+
+// Test that the -j alias can be used flexibly. Create a baseline and ensure
+// all other combinations are identical.
+// RUN: llvm-objdump %p/Inputs/section-filter.obj -h -s --section .symtab > %t.full
+// RUN: llvm-objdump %p/Inputs/section-filter.obj -h -s -j .symtab > %t.1
+// RUN: llvm-objdump %p/Inputs/section-filter.obj -h -s -j=.symtab > %t.2
+// RUN: llvm-objdump %p/Inputs/section-filter.obj -h -s -j.symtab > %t.3
+// RUN: llvm-objdump %p/Inputs/section-filter.obj -hsj .symtab > %t.4
+// RUN: llvm-objdump %p/Inputs/section-filter.obj -hsj=.symtab > %t.5
+// RUN: llvm-objdump %p/Inputs/section-filter.obj -hsj.symtab > %t.6
+
+// RUN: cmp %t.full %t.1
+// RUN: cmp %t.full %t.2
+// RUN: cmp %t.full %t.3
+// RUN: cmp %t.full %t.4
+// RUN: cmp %t.full %t.5
+// RUN: cmp %t.full %t.6

llvm/tools/llvm-objdump/llvm-objdump.cpp

 static cl::opt<bool>
     ShowLMA("show-lma",
             cl::desc("Display LMA column when dumping ELF section headers"));
 
 cl::list<std::string>
 llvm::FilterSections("section", cl::desc("Operate on the specified sections only. "
                                          "With -macho dump segment,section"));
 cl::alias static FilterSectionsj("j", cl::desc("Alias for --section"),
-                                 cl::NotHidden,
+                                 cl::NotHidden, cl::Grouping, cl::Prefix,
                                  cl::aliasopt(llvm::FilterSections));
 
 cl::list<std::string>
 llvm::MAttrs("mattr",
   cl::CommaSeparated,
   cl::desc("Target specific attributes"),
   cl::value_desc("a1,+a2,-a3,..."));
 
cl::alias DisassembleZeroesShort("z",
                                  cl::aliasopt(DisassembleZeroes));
 
 static cl::list<std::string>
     DisassemblerOptions("disassembler-options",
                         cl::desc("Pass target specific disassembler options"),
                         cl::value_desc("options"), cl::CommaSeparated);
 static cl::alias
     DisassemblerOptionsShort("M", cl::desc("Alias for --disassembler-options"),
-                             cl::NotHidden, cl::Prefix, cl::CommaSeparated,
+                             cl::NotHidden, cl::Grouping, cl::Prefix,
+                             cl::CommaSeparated,
                              cl::aliasopt(DisassemblerOptions));
 
 static StringRef ToolName;
 
 typedef std::vector<std::tuple<uint64_t, StringRef, uint8_t>> SectionSymbolsTy;
 
 SectionFilter llvm::ToolSectionFilter(llvm::object::ObjectFile const &O) {
   return SectionFilter(