[llvm] r227903 - Use a non-fatal diag handler in the C API. FIxes PR22368.

[Rafael Espindola]

Author: rafael
Date: Mon Feb  2 18:49:57 2015
New Revision: 227903

URL: http://llvm.org/viewvc/llvm-project?rev=227903&view=rev
Log:
Use a non-fatal diag handler in the C API. FIxes PR22368.

Added:
    llvm/trunk/test/Bindings/llvm-c/Inputs/
    llvm/trunk/test/Bindings/llvm-c/Inputs/invalid.ll.bc
    llvm/trunk/test/Bindings/llvm-c/invalid-bitcode.test
Modified:
    llvm/trunk/lib/Bitcode/Reader/BitReader.cpp

Modified: llvm/trunk/lib/Bitcode/Reader/BitReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitReader.cpp?rev=227903&r1=227902&r2=227903&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitReader.cpp Mon Feb  2 18:49:57 2015
@@ -9,9 +9,11 @@
 
 #include "llvm-c/BitReader.h"
 #include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/IR/DiagnosticPrinter.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
 #include <cstring>
 #include <string>
 
@@ -30,8 +32,15 @@ LLVMBool LLVMParseBitcodeInContext(LLVMC
                                    LLVMMemoryBufferRef MemBuf,
                                    LLVMModuleRef *OutModule,
                                    char **OutMessage) {
-  ErrorOr<Module *> ModuleOrErr =
-      parseBitcodeFile(unwrap(MemBuf)->getMemBufferRef(), *unwrap(ContextRef));
+  MemoryBufferRef Buf = unwrap(MemBuf)->getMemBufferRef();
+  LLVMContext &Ctx = *unwrap(ContextRef);
+
+  std::string Message;
+  raw_string_ostream Stream(Message);
+  DiagnosticPrinterRawOStream DP(Stream);
+
+  ErrorOr<Module *> ModuleOrErr = parseBitcodeFile(
+      Buf, Ctx, [&](const DiagnosticInfo &DI) { DI.print(DP); });
   if (std::error_code EC = ModuleOrErr.getError()) {
     if (OutMessage)
       *OutMessage = strdup(EC.message().c_str());

Added: llvm/trunk/test/Bindings/llvm-c/Inputs/invalid.ll.bc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/llvm-c/Inputs/invalid.ll.bc?rev=227903&view=auto
==============================================================================
Binary files llvm/trunk/test/Bindings/llvm-c/Inputs/invalid.ll.bc (added) and llvm/trunk/test/Bindings/llvm-c/Inputs/invalid.ll.bc Mon Feb  2 18:49:57 2015 differ

Added: llvm/trunk/test/Bindings/llvm-c/invalid-bitcode.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/llvm-c/invalid-bitcode.test?rev=227903&view=auto
==============================================================================
--- llvm/trunk/test/Bindings/llvm-c/invalid-bitcode.test (added)
+++ llvm/trunk/test/Bindings/llvm-c/invalid-bitcode.test Mon Feb  2 18:49:57 2015
@@ -0,0 +1,3 @@
+; RUN: not llvm-c-test --module-dump < %S/Inputs/invalid.ll.bc 2>&1 | FileCheck %s
+
+CHECK: Error parsing bitcode: Corrupted bitcode