Fix LLVMLinkModules for LLVM-3.1

llvm/_core.cpp

@@ -278,8 +278,8 @@ _wLLVMLinkModules(PyObject *self, PyObject *args)
     const LLVMModuleRef dest = pycap_get<LLVMModuleRef>(dest_obj ) ;
     const LLVMModuleRef src = pycap_get<LLVMModuleRef>(src_obj) ;
 
-    PyObject *ret;
+    PyObject *ret = NULL;
-    char *errmsg;
+    char *errmsg = NULL;
     if (LLVMLinkModules(dest, src, (LLVMLinkerMode)mode, &errmsg)) {
         if (errmsg) {
             ret = PyUnicode_FromString(errmsg);

llvm/extra.cpp

@@ -1191,21 +1191,15 @@ LLVMModuleRef LLVMGetModuleFromBitcode(const char *bitcode, unsigned bclen,
 }
 
 #if LLVM_VERSION_MAJOR <= 3 && LLVM_VERSION_MINOR < 2
-unsigned LLVMLinkModules(LLVMModuleRef dest, LLVMModuleRef src, unsigned int mode,
+// Shamelessly copy from LLVM-3.2
-			 char **out)
+unsigned LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src,
-{
+                         int Mode, char **OutMessages) {
-    llvm::Module *sourcep = llvm::unwrap(src);
+    std::string Messages;
-    assert(sourcep);
+    unsigned Result = Linker::LinkModules(unwrap(Dest), unwrap(Src), Mode,
-    llvm::Module *destinationp = llvm::unwrap(dest);
+                                          OutMessages? &Messages : 0);
-    assert(destinationp);
+    if (OutMessages)
-
+            *OutMessages = strdup(Messages.c_str());
-    std::string msg;
+    return Result;
-    if (llvm::Linker::LinkModules(destinationp, sourcep, mode, &msg)) {
-        *out = strdup(msg.c_str());
-        return 0;
-    }
-
-    return 1;
 }
 #endif
 

llvm/extra.h

@@ -46,10 +46,9 @@
 #endif
 
 #include "llvm-c/Transforms/PassManagerBuilder.h"
-
-
 #include "llvm_c_extra.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -578,8 +577,8 @@ LLVMModuleRef LLVMGetModuleFromBitcode(const char *bc, unsigned bclen,
 /* Wraps llvm::Linker::LinkModules().  Returns 0 on failure (with errmsg
  * filled in) and 1 on success.  Dispose error message after use with
  * LLVMDisposeMessage(). */
-unsigned LLVMLinkModules(LLVMModuleRef dest, LLVMModuleRef src,
+unsigned LLVMLinkModules(LLVMModuleRef dest, LLVMModuleRef src, int mode,
-			 unsigned int, char **errmsg);
+                         char **errmsg);
 #endif
 /* Returns pointer to a heap-allocated block of `*len' bytes containing bit code
  * for the given module. NULL on error. */