[llvm-objdump] --no-leading-addr: hide inline relocation offsets

[MaskRay]

Summary

It seems to make sense to omit offsets when --no-leading-addr is specified. The output is now closer
to objdump -dr --no-addresses (non-wide output).

[nickdesaulniers]

Thanks for the patches!

llvm/docs/CommandGuide/llvm-objdump.rst

 
 .. option:: --mattr=<a1,+a2,-a3,...>
 
   Enable/disable target-specific attributes. Specify ``--mattr=help`` to display
   the available attributes.
 
 .. option:: --no-leading-addr
 
-  When disassembling, do not print leading addresses.
+  When disassembling, do not print leading addresses for instructions and inline
+  relocations.
 
 .. option:: --no-print-imm-hex
 
   Do not use hex format for immediate values in disassembly output (default).
 
 .. option:: --no-show-raw-insn
 
   When disassembling, do not print the raw bytes of each instruction.

llvm/test/tools/llvm-objdump/X86/elf-disassemble-relocs-exec.test

 ## Check that 'llvm-objdump -dr' correctly prints relocations in executables.
 
 # RUN: yaml2obj --docnum=1 %s -o %t
-# RUN: llvm-objdump -dr %t | FileCheck %s
+# RUN: llvm-objdump -dr %t | FileCheck %s --match-full-lines --strict-whitespace
+# RUN: llvm-objdump -dr --no-leading-addr %t | FileCheck %s --check-prefix=NOADDR --match-full-lines --strict-whitespace
 
-# CHECK:       400000: 90                            nop
-# CHECK-NEXT:  400001: bf 10 00 40 00                movl    $4194320, %edi
-# CHECK-NEXT:                0000000000400002:  R_X86_64_32  .rodata
-# CHECK-NEXT:  400006: e8 fc fe ff ff                callq   0x3fff07
-# CHECK-NEXT:                0000000000400007:  R_X86_64_PLT32       puts-0x4
-# CHECK-NEXT:  40000b: 90                            nop
+# RUN: yaml2obj -DBITS=32 %s -o %t.32
+# RUN: llvm-objdump -dr --no-leading-addr %t | FileCheck %s --check-prefix=NOADDR --match-full-lines --strict-whitespace
+
+#      CHECK:0000000000400000 <.text>:
+# CHECK-NEXT:  400000: 90                             nop
+# CHECK-NEXT:  400001: bf 10 00 40 00                 movl  $4194320, %edi          # imm = 0x400010
+# CHECK-NEXT:   0000000000400002:  R_X86_64_32  .rodata
+# CHECK-NEXT:  400006: e8 fc fe ff ff                 callq 0x3fff07 <puts+0x3fff07>
+# CHECK-NEXT:   0000000000400007:  R_X86_64_PLT32 puts-0x4
+# CHECK-NEXT:  40000b: 90                             nop
 
+#      NOADDR:<.text>:
+# NOADDR-NEXT: 90                                     nop
+# NOADDR-NEXT: bf 10 00 40 00                         movl  $4194320, %edi          # imm = 0x400010
+# NOADDR-NEXT:    R_X86_64_32 .rodata
+# NOADDR-NEXT: e8 fc fe ff ff                         callq 0x3fff07 <puts+0x3fff07>
+# NOADDR-NEXT:    R_X86_64_PLT32  puts-0x4
+# NOADDR-NEXT: 90                                     nop
+
 --- !ELF
 FileHeader:
-  Class:           ELFCLASS64
+  Class:           ELFCLASS[[BITS=64]]
   Data:            ELFDATA2LSB
   Type:            ET_EXEC
   Machine:         EM_X86_64
 ProgramHeaders:
   - Type:            PT_LOAD
     Flags:           [ PF_X, PF_R ]
     FirstSec:        .text
     LastSec:         .rodata

llvm/tools/llvm-objdump/ObjdumpOpts.td

def mattr_EQ : Joined<["--"], "mattr=">,
   MetaVarName<"a1,+a2,-a3,...">,
   HelpText<"Target specific attributes (--mattr=help for details)">;
 
 def no_show_raw_insn : Flag<["--"], "no-show-raw-insn">,
   HelpText<"When disassembling instructions, "
            "do not print the instruction bytes.">;
 
 def no_leading_addr : Flag<["--"], "no-leading-addr">,
-  HelpText<"When disassembling, do not print leading addresses">;
+  HelpText<"When disassembling, do not print leading addresses for instructions and inline relocations">;
 
 def raw_clang_ast : Flag<["--"], "raw-clang-ast">,
   HelpText<"Dump the raw binary contents of the clang AST section">;
 
 def reloc : Flag<["--"], "reloc">,
   HelpText<"Display the relocation entries in the file">;
 def : Flag<["-"], "r">, Alias<reloc>, HelpText<"Alias for --reloc">;
 

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

 
 static bool hasMappingSymbols(const ObjectFile &Obj) {
   return isArmElf(Obj) || isAArch64Elf(Obj) || isCSKYElf(Obj) ;
 }
 
 static void printRelocation(formatted_raw_ostream &OS, StringRef FileName,
                             const RelocationRef &Rel, uint64_t Address,
                             bool Is64Bits) {
-  StringRef Fmt = Is64Bits ? "\t\t%016" PRIx64 ":  " : "\t\t\t%08" PRIx64 ":  ";
+  StringRef Fmt = Is64Bits ? "%016" PRIx64 ":  " : "%08" PRIx64 ":  ";
   SmallString<16> Name;
   SmallString<32> Val;
   Rel.getTypeName(Name);
   if (Error E = getRelocationValueString(Rel, Val))
     reportError(std::move(E), FileName);
-  OS << format(Fmt.data(), Address) << Name << "\t" << Val;
+  OS << (Is64Bits || !LeadingAddr ? "\t\t" : "\t\t\t");
+  if (LeadingAddr)
+    OS << format(Fmt.data(), Address);
+  OS << Name << "\t" << Val;
 }
 
 static void AlignToInstStartColumn(size_t Start, const MCSubtargetInfo &STI,
                                    raw_ostream &OS) {
   // The output of printInst starts with a tab. Print some spaces so that
   // the tab has 1 column and advances to the target tab stop.
   unsigned TabStop = getInstStartColumn(STI);
   unsigned Column = OS.tell() - Start;