Return an error_code from materializeAllPermanently.

llvm-svn: 199275
2014-01-14 23:51:27 +00:00
parent 4dcc4637b5
commit e9fab9b077
7 changed files with 25 additions and 21 deletions
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -3359,7 +3359,9 @@ Module *llvm::ParseBitcodeFile(MemoryBuffer *Buffer, LLVMContext& Context,
  static_cast<BitcodeReader*>(M->getMaterializer())->setBufferOwned(false);

  // Read in the entire module, and destroy the BitcodeReader.
-  if (M->MaterializeAllPermanently(ErrMsg)) {
+  if (error_code EC = M->materializeAllPermanently()) {
+    if (ErrMsg)
+      *ErrMsg = EC.message();
    delete M;
    return 0;
  }