[llvm] 1ca85b3 - [llvm-bcanalyzer] Don't dump the contents if -dump is not passed

[Francis Visoiu Mistrih via llvm-commits]

Author: Francis Visoiu Mistrih
Date: 2019-11-13T10:38:57-08:00
New Revision: 1ca85b3d33a14394c9c11d68a40d038075d7e8ee

URL: https://github.com/llvm/llvm-project/commit/1ca85b3d33a14394c9c11d68a40d038075d7e8ee
DIFF: https://github.com/llvm/llvm-project/commit/1ca85b3d33a14394c9c11d68a40d038075d7e8ee.diff

LOG: [llvm-bcanalyzer] Don't dump the contents if -dump is not passed

With all the previous refactorings this slipped through and now we
always dump the contents of the bitcode files, even if -dump is not
passed.

Added: 
    llvm/test/Other/bcanalyzer-dump-option.txt

Modified: 
    llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/Other/bcanalyzer-dump-option.txt b/llvm/test/Other/bcanalyzer-dump-option.txt
new file mode 100644
index 000000000000..1da2a033b6a2
--- /dev/null
+++ b/llvm/test/Other/bcanalyzer-dump-option.txt
@@ -0,0 +1,11 @@
+RUN: llvm-bcanalyzer -dump %S/Inputs/has-block-info.bc | FileCheck -check-prefix=WITH-DUMP %s
+RUN: llvm-bcanalyzer %S/Inputs/has-block-info.bc | FileCheck -check-prefix=WITHOUT-DUMP %s
+
+WITH-DUMP: <ABC
+WITHOUT-DUMP-NOT: <ABC
+WITH-DUMP: </ABC>
+WITHOUT-DUMP-NOT: </ABC>
+WITH-DUMP: <XYZ
+WITHOUT-DUMP-NOT: <XYZ
+WITH-DUMP: </XYZ>
+WITHOUT-DUMP-NOT: </XYZ>

diff  --git a/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
index 01cba1f6e3c9..639a6d1ec02c 100644
--- a/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
+++ b/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
@@ -102,8 +102,9 @@ int main(int argc, char **argv) {
   O.Symbolic = !NonSymbolic;
   O.ShowBinaryBlobs = ShowBinaryBlobs;
 
-  ExitOnErr(
-      BA.analyze(O, CheckHash.empty() ? None : Optional<StringRef>(CheckHash)));
+  ExitOnErr(BA.analyze(
+      Dump ? Optional<BCDumpOptions>(O) : Optional<BCDumpOptions>(None),
+      CheckHash.empty() ? None : Optional<StringRef>(CheckHash)));
 
   if (Dump)
     outs() << "\n\n";