Change the verifier to never throw an exception. Instead verifyModule canoptionally return the string error, which is an easier api for clients touse anyway.

llvm-svn: 29017

1 files changed, 10 insertions, 8 deletions

diff --git a/llvm/tools/llvm2cpp/llvm2cpp.cpp b/llvm/tools/llvm2cpp/llvm2cpp.cpp
index 9035e71c075..7e322dbef81 100644
--- a/llvm/tools/llvm2cpp/llvm2cpp.cpp
+++ b/llvm/tools/llvm2cpp/llvm2cpp.cpp
@@ -59,14 +59,16 @@ int main(int argc, char **argv) {
       return 1;
     }
 
-    try {
-      if (!DisableVerify)
-        verifyModule(*M.get(), ThrowExceptionAction);
-    } catch (const std::string &Err) {
-      std::cerr << argv[0]
-                << ": assembly parsed, but does not verify as correct!\n";
-      std::cerr << Err;
-      return 1;
+    // FIXME: llvm2cpp should read .bc files and thus not run the verifier
+    // explicitly!
+    if (!DisableVerify) {
+      std::string Err;
+      if (verifyModule(*M.get(), ReturnStatusAction, &Err)) {
+        std::cerr << argv[0]
+                  << ": assembly parsed, but does not verify as correct!\n";
+        std::cerr << Err;
+        return 1;
+      } 
     }
 
     if (OutputFilename != "") {   // Specified an output filename?