[PATCH] D62054: [llvm-objdump] Make --disassemble-functions imply -d

[Mike Pozulp via Phabricator via llvm-commits]

mmpozulp updated this revision to Diff 200400.
mmpozulp added a comment.

Change a CHECK to CHECK-NEXT, thanks @jhenderson.


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D62054/new/

https://reviews.llvm.org/D62054

Files:
  llvm/test/tools/llvm-objdump/X86/disassemble-implied-by-disassemble-functions.test
  llvm/tools/llvm-objdump/llvm-objdump.cpp


Index: llvm/tools/llvm-objdump/llvm-objdump.cpp
===================================================================
--- llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -2035,7 +2035,8 @@
     ArchiveHeaders = FileHeaders = PrivateHeaders = Relocations =
         SectionHeaders = SymbolTable = true;
 
-  if (DisassembleAll || PrintSource || PrintLines)
+  if (DisassembleAll || PrintSource || PrintLines ||
+      (!DisassembleFunctions.empty()))
     Disassemble = true;
 
   if (!ArchiveHeaders && !Disassemble && DwarfDumpType == DIDT_Null &&
Index: llvm/test/tools/llvm-objdump/X86/disassemble-implied-by-disassemble-functions.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-objdump/X86/disassemble-implied-by-disassemble-functions.test
@@ -0,0 +1,22 @@
+## Check that --disassemble-functions implies --disassemble.
+# RUN: yaml2obj < %s | llvm-objdump - --disassemble-functions=main | FileCheck %s
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name:    .text
+    Type:    SHT_PROGBITS
+    Flags:   [ SHF_EXECINSTR ]
+    Content: 90
+Symbols:
+  - Name:    main
+    Type:    STT_FUNC
+    Section: .text
+...
+
+# CHECK: 0000000000000000 main:
+# CHECK-NEXT:        0: 90                            nop


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D62054.200400.patch
Type: text/x-patch
Size: 1400 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190521/ad70552b/attachment.bin>