commit e9fab9b0778b2df4480d9cd7fa0d2a3ac4c8bfac
author Rafael Espindola <rafael.espindola@gmail.com> Tue Jan 14 23:51:27 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Tue Jan 14 23:51:27 2014 +0000
tree ca2481c9748e4a5b830a9eed092a0fe7a49315b7
parent 4dcc4637b510002e85efb7cff5420597064c9376

Return an error_code from materializeAllPermanently.

llvm-svn: 199275

llvm/tools/llvm-dis/llvm-dis.cpp

diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp
index 6d471ef..9fb0565 100644
--- a/llvm/tools/llvm-dis/llvm-dis.cpp
+++ b/llvm/tools/llvm-dis/llvm-dis.cpp
@@ -135,8 +135,11 @@
       DisplayFilename = InputFilename;
     M.reset(getStreamedBitcodeModule(DisplayFilename, streamer, Context,
                                      &ErrorMessage));
-    if(M.get() != 0 && M->MaterializeAllPermanently(&ErrorMessage)) {
-      M.reset();
+    if(M.get() != 0) {
+      if (error_code EC = M->materializeAllPermanently()) {
+        ErrorMessage = EC.message();
+        M.reset();
+      }
     }
   }