Module.link_in and Instruction.is_volatile APIs added (Seth Warn)

git-svn-id: http://llvm-py.googlecode.com/svn/trunk@62 8d1e9007-1d4e-0410-b67e-1979fd6579aa

llvm/extra.cpp

@@ -43,6 +43,7 @@
 // LLVM includes
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/Casting.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/GlobalVariable.h"
@@ -60,6 +61,7 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
 #include "llvm/Transforms/Instrumentation.h"
+#include "llvm/Linker.h"
 
 // LLVM-C includes
 #include "llvm-c/Core.h"
@@ -212,6 +214,15 @@ inst_checkfn(LLVMInstIsAssociative,     isAssociative)
 inst_checkfn(LLVMInstIsCommutative,     isCommutative)
 inst_checkfn(LLVMInstIsTrapping,        isTrapping)
 
+unsigned LLVMInstIsVolatile(LLVMValueRef v)
+{
+    using namespace llvm;
+    Instruction *ip = unwrap<Instruction>(v);
+    assert(ip);
+    return ((isa<LoadInst>(*ip)  && cast<LoadInst>(*ip).isVolatile()) ||
+            (isa<StoreInst>(*ip) && cast<StoreInst>(*ip).isVolatile()) );
+}
+
 const char *LLVMInstGetOpcodeName(LLVMValueRef inst)
 {
     llvm::Instruction *instp = llvm::unwrap<llvm::Instruction>(inst);
@@ -332,6 +343,22 @@ LLVMModuleRef LLVMGetModuleFromBitcode(const char *bitcode, unsigned bclen,
     return wrap(modulep);
 }
 
+unsigned LLVMLinkModules(LLVMModuleRef dest, LLVMModuleRef src, char **out)
+{
+    llvm::Module *sourcep = llvm::unwrap(src);
+    assert(sourcep);
+    llvm::Module *destinationp = llvm::unwrap(dest);
+    assert(destinationp);
+
+    std::string msg;
+    if (llvm::Linker::LinkModules(destinationp, sourcep, &msg)) {
+        *out = strdup(msg.c_str());
+        return 0;
+    }
+
+    return 1;
+}
+
 unsigned char *LLVMGetBitcodeFromModule(LLVMModuleRef module, unsigned *lenp)
 {
     assert(lenp);