Give verbose error messages if bytecode file cannot be parsed

llvm-svn: 5789

4 files changed, 28 insertions, 8 deletions

diff --git a/llvm/tools/dis/dis.cpp b/llvm/tools/dis/dis.cpp
index 166a178d574..a48dd7eb1a0 100644
--- a/llvm/tools/dis/dis.cpp
+++ b/llvm/tools/dis/dis.cpp
@@ -48,10 +48,15 @@ WriteMode(cl::desc("Specify the output format:"),
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm .bc -> .ll disassembler\n");
   std::ostream *Out = &std::cout;  // Default to printing to stdout...
+  std::string ErrorMessage;
 
-  std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
+  std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
   if (M.get() == 0) {
-    cerr << argv[0] << ": bytecode didn't read correctly.\n";
+    cerr << argv[0] << ": ";
+    if (ErrorMessage.size())
+      cerr << ErrorMessage << "\n";
+    else
+      cerr << "bytecode didn't read correctly.\n";
     return 1;
   }
   
diff --git a/llvm/tools/llvm-dis/dis.cpp b/llvm/tools/llvm-dis/dis.cpp
index 166a178d574..a48dd7eb1a0 100644
--- a/llvm/tools/llvm-dis/dis.cpp
+++ b/llvm/tools/llvm-dis/dis.cpp
@@ -48,10 +48,15 @@ WriteMode(cl::desc("Specify the output format:"),
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm .bc -> .ll disassembler\n");
   std::ostream *Out = &std::cout;  // Default to printing to stdout...
+  std::string ErrorMessage;
 
-  std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
+  std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
   if (M.get() == 0) {
-    cerr << argv[0] << ": bytecode didn't read correctly.\n";
+    cerr << argv[0] << ": ";
+    if (ErrorMessage.size())
+      cerr << ErrorMessage << "\n";
+    else
+      cerr << "bytecode didn't read correctly.\n";
     return 1;
   }
   
diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp
index 166a178d574..a48dd7eb1a0 100644
--- a/llvm/tools/llvm-dis/llvm-dis.cpp
+++ b/llvm/tools/llvm-dis/llvm-dis.cpp
@@ -48,10 +48,15 @@ WriteMode(cl::desc("Specify the output format:"),
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm .bc -> .ll disassembler\n");
   std::ostream *Out = &std::cout;  // Default to printing to stdout...
+  std::string ErrorMessage;
 
-  std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
+  std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
   if (M.get() == 0) {
-    cerr << argv[0] << ": bytecode didn't read correctly.\n";
+    cerr << argv[0] << ": ";
+    if (ErrorMessage.size())
+      cerr << ErrorMessage << "\n";
+    else
+      cerr << "bytecode didn't read correctly.\n";
     return 1;
   }
   
diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp
index 803f4c69931..6633dd18cba 100644
--- a/llvm/tools/opt/opt.cpp
+++ b/llvm/tools/opt/opt.cpp
@@ -76,11 +76,16 @@ int main(int argc, char **argv) {
   std::auto_ptr<TargetMachine> target;
 
   TargetMachine* TM = NULL;
+  std::string ErrorMessage;
 
   // Load the input module...
-  std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
+  std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
   if (M.get() == 0) {
-    cerr << argv[0] << ": bytecode didn't read correctly.\n";
+    cerr << argv[0] << ": ";
+    if (ErrorMessage.size())
+      cerr << ErrorMessage << "\n";
+    else
+      cerr << "bytecode didn't read correctly.\n";
     return 1;
   }