[PATCH] D73574: Omit "Contents of" headers when -no-leading-headers is specified.

[Michael Trent via Phabricator via llvm-commits]

mtrent created this revision.
mtrent added reviewers: ab, pete.
Herald added a subscriber: rupprecht.
Herald added a reviewer: jhenderson.
Herald added a project: LLVM.

llvm-objdump -macho will no longer print "Contents of" headers when
disassembling section contents when -no-leading-headers is specified.
For historical reasons, this flag is independent of -no-leading-addr.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D73574

Files:
  llvm/test/tools/llvm-objdump/X86/macho-cstring-dump.test
  llvm/tools/llvm-objdump/MachODump.cpp


Index: llvm/tools/llvm-objdump/MachODump.cpp
===================================================================
--- llvm/tools/llvm-objdump/MachODump.cpp
+++ llvm/tools/llvm-objdump/MachODump.cpp
@@ -1776,8 +1776,9 @@
         uint32_t sect_size = BytesStr.size();
         uint64_t sect_addr = Section.getAddress();
 
-        outs() << "Contents of (" << SegName << "," << SectName
-               << ") section\n";
+        if (!NoLeadingHeaders)
+          outs() << "Contents of (" << SegName << "," << SectName
+                 << ") section\n";
 
         if (verbose) {
           if ((section_flags & MachO::S_ATTR_PURE_INSTRUCTIONS) ||
Index: llvm/test/tools/llvm-objdump/X86/macho-cstring-dump.test
===================================================================
--- llvm/test/tools/llvm-objdump/X86/macho-cstring-dump.test
+++ llvm/test/tools/llvm-objdump/X86/macho-cstring-dump.test
@@ -1,5 +1,6 @@
 RUN: llvm-objdump -m -section __TEXT,__cstring %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
 RUN: llvm-objdump -m -section __TEXT,__cstring -no-leading-addr %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NO_ADDR
+RUN: llvm-objdump -m -section __TEXT,__cstring -no-leading-addr -no-leading-headers %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NO_ADDR_NO_HEADERS
 RUN: llvm-objdump -m -section __TEXT,__cstring -non-verbose %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NON_VERBOSE
 
 CHECK: Contents of (__TEXT,__cstring) section
@@ -9,5 +10,10 @@
 NO_ADDR: Hello world\n
 NO_ADDR-NOT: 000000000000003b
 
+NO_ADDR_NO_HEADERS-NOT: Inputs/hello.obj.macho-x86_64:
+NO_ADDR_NO_HEADERS-NOT: Contents of (__TEXT,__cstring) section
+NO_ADDR_NO_HEADERS-NOT: 000000000000003b
+NO_ADDR_NO_HEADERS: Hello world\n
+
 NON_VERBOSE: Contents of (__TEXT,__cstring) section
-NON_VERBOSE: 000000000000003b	48 65 6c 6c 6f 20 77 6f 72 6c 64 0a 00 
+NON_VERBOSE: 000000000000003b	48 65 6c 6c 6f 20 77 6f 72 6c 64 0a 00


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D73574.240973.patch
Type: text/x-patch
Size: 1967 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200128/2a623369/attachment.bin>