r199126 - Update for getLazyBitcodeModule API change.

Rafael Espindola rafael.espindola at gmail.com
Mon Jan 13 10:31:09 PST 2014


Author: rafael
Date: Mon Jan 13 12:31:09 2014
New Revision: 199126

URL: http://llvm.org/viewvc/llvm-project?rev=199126&view=rev
Log:
Update for getLazyBitcodeModule API change.

Modified:
    cfe/trunk/lib/CodeGen/CodeGenAction.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenAction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenAction.cpp?rev=199126&r1=199125&r2=199126&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenAction.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenAction.cpp Mon Jan 13 12:31:09 2014
@@ -354,12 +354,14 @@ ASTConsumer *CodeGenAction::CreateASTCon
       return 0;
     }
 
-    LinkModuleToUse = getLazyBitcodeModule(BCBuf, *VMContext, &ErrorStr);
-    if (!LinkModuleToUse) {
+    ErrorOr<llvm::Module *> ModuleOrErr =
+        getLazyBitcodeModule(BCBuf, *VMContext);
+    if (error_code EC = ModuleOrErr.getError()) {
       CI.getDiagnostics().Report(diag::err_cannot_open_file)
-        << LinkBCFile << ErrorStr;
+        << LinkBCFile << EC.message();
       return 0;
     }
+    LinkModuleToUse = ModuleOrErr.get();
   }
 
   BEConsumer = 





More information about the cfe-commits mailing list