From efe98de75a23dffb16cad881248fadd42777ff34 Mon Sep 17 00:00:00 2001
From: George Rimar <grimar@accesssoftek.com>
Date: Tue, 21 May 2019 11:05:46 +0000
Subject: [PATCH] [llvm-objdump] Make --disassemble-functions imply -d

Fixes https://bugs.llvm.org/show_bug.cgi?id=41903

Patch by Mike Pozulp!

Differential revision: https://reviews.llvm.org/D62054

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361240 91177308-0d34-0410-b5e6-96231b3b80d8
---
 ...sassemble-implied-by-disassemble-functions.test | 22 ++++++++++++++++++++++
 tools/llvm-objdump/llvm-objdump.cpp                |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 test/tools/llvm-objdump/X86/disassemble-implied-by-disassemble-functions.test

diff --git a/test/tools/llvm-objdump/X86/disassemble-implied-by-disassemble-functions.test b/test/tools/llvm-objdump/X86/disassemble-implied-by-disassemble-functions.test
new file mode 100644
index 00000000000..56c2dcd51d9
--- /dev/null
+++ b/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
diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index de26b61697c..9f06268a8ec 100644
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/tools/llvm-objdump/llvm-objdump.cpp
@@ -2032,7 +2032,8 @@ int main(int argc, char **argv) {
     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 &&
-- 
2.11.0