Fix error handling in LLVMGetBitcodeModuleInContext.

It was not setting OutMessage.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255998 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Bitcode/Reader/BitReader.cpp b/lib/Bitcode/Reader/BitReader.cpp
index 7ace802ba21a05b992ff1fbdbe1716e4aca6ec5b..2d15165dcec16ee2e82cc454964d67dc19ff41c9 100644 (file)
--- a/lib/Bitcode/Reader/BitReader.cpp
+++ b/lib/Bitcode/Reader/BitReader.cpp
@@ -71,17 +71,24 @@ LLVMBool LLVMGetBitcodeModuleInContext(LLVMContextRef ContextRef,
                                        LLVMMemoryBufferRef MemBuf,
                                        LLVMModuleRef *OutM,
                                        char **OutMessage) {
                                        LLVMMemoryBufferRef MemBuf,
                                        LLVMModuleRef *OutM,
                                        char **OutMessage) {

+  LLVMContext &Ctx = *unwrap(ContextRef);
+  LLVMContext::DiagnosticHandlerTy OldDiagnosticHandler =
+      Ctx.getDiagnosticHandler();
+  void *OldDiagnosticContext = Ctx.getDiagnosticContext();
+

   std::string Message;
   std::string Message;

+  Ctx.setDiagnosticHandler(diagnosticHandler, &Message, true);

   std::unique_ptr<MemoryBuffer> Owner(unwrap(MemBuf));
 
   ErrorOr<std::unique_ptr<Module>> ModuleOrErr =
   std::unique_ptr<MemoryBuffer> Owner(unwrap(MemBuf));
 
   ErrorOr<std::unique_ptr<Module>> ModuleOrErr =

-      getLazyBitcodeModule(std::move(Owner), *unwrap(ContextRef));
+      getLazyBitcodeModule(std::move(Owner), Ctx);

   Owner.release();
   Owner.release();

+  Ctx.setDiagnosticHandler(OldDiagnosticHandler, OldDiagnosticContext, true);

 
 

-  if (std::error_code EC = ModuleOrErr.getError()) {
+  if (ModuleOrErr.getError()) {

     *OutM = wrap((Module *)nullptr);
     if (OutMessage)
     *OutM = wrap((Module *)nullptr);
     if (OutMessage)

-      *OutMessage = strdup(EC.message().c_str());
+      *OutMessage = strdup(Message.c_str());

     return 1;
   }
 
     return 1;
   }
 

diff --git a/test/Bindings/llvm-c/invalid-bitcode.test b/test/Bindings/llvm-c/invalid-bitcode.test
index f8835b9b8bd0243603dd6ad927cc440dd4db5582..65b97e60281b31e1d33221d61d2bbdc177c80a18 100644 (file)
--- a/test/Bindings/llvm-c/invalid-bitcode.test
+++ b/test/Bindings/llvm-c/invalid-bitcode.test
@@ -1,3 +1,4 @@
 ; RUN: not llvm-c-test --module-dump < %S/Inputs/invalid.ll.bc 2>&1 | FileCheck %s
 ; RUN: not llvm-c-test --module-dump < %S/Inputs/invalid.ll.bc 2>&1 | FileCheck %s

+; RUN: not llvm-c-test --lazy-module-dump < %S/Inputs/invalid.ll.bc 2>&1 | FileCheck %s

 
 CHECK: Error parsing bitcode: Unknown attribute kind (52)
 
 CHECK: Error parsing bitcode: Unknown attribute kind (52)