diff --git a/llvm/test/Other/bcanalyzer-dump-option.txt b/llvm/test/Other/bcanalyzer-dump-option.txt
new file mode 100644
index 00000000000000..1da2a033b6a2c3
--- /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 01cba1f6e3c96d..639a6d1ec02cd3 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";