jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Module.link_in so it reports error and destory the other module when preserve=False

Browse source
This commit is contained in:
Siu Kwan Lam 2013-01-10 16:52:25 -06:00
commit ee62b0c96c
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
llvm/_core.cpp
View file

@ -280,7 +280,7 @@ _wLLVMLinkModules(PyObject *self, PyObject *args)
PyObject *ret; PyObject *ret;
char *errmsg; char *errmsg;
if (!LLVMLinkModules(dest, src, (LLVMLinkerMode)mode, &errmsg)) { if (LLVMLinkModules(dest, src, (LLVMLinkerMode)mode, &errmsg)) {
if (errmsg) { if (errmsg) {
ret = PyUnicode_FromString(errmsg); ret = PyUnicode_FromString(errmsg);
LLVMDisposeMessage(errmsg); LLVMDisposeMessage(errmsg);

13
llvm/core.py
View file

@ -466,10 +466,12 @@ class Module(llvm.Ownable, llvm.Cacheable):
check_is_module(other) check_is_module(other)
if not preserve: if not preserve:
other.forget() # remove it from object cache other.forget() # remove it from object cache
_core.LLVMLinkModules(self.ptr, other.ptr, int(bool(preserve))) result = _core.LLVMLinkModules(self.ptr, other.ptr, int(bool(preserve)))
if result is not None:
raise llvm.LLVMException(result)
if not preserve: if not preserve:
# Do not try to destroy the other module's llvm::Module*. # Prevent user from using the other module
other._own(llvm.DummyOwner()) del other.ptr
def get_type_named(self, name): def get_type_named(self, name):
"""Return a Type object with the given name.""" """Return a Type object with the given name."""
@ -1865,8 +1867,9 @@ class Builder(object):
def branch(self, bblk): def branch(self, bblk):
check_is_basic_block(bblk) check_is_basic_block(bblk)
for instr in self.basic_block.instructions: if __debug__:
assert not instr.is_terminator, "BasicBlock can only have one terminator" for instr in self.basic_block.instructions:
assert not instr.is_terminator, "BasicBlock can only have one terminator"
return _make_value(_core.LLVMBuildBr(self.ptr, bblk.ptr)) return _make_value(_core.LLVMBuildBr(self.ptr, bblk.ptr))
def cbranch(self, if_value, then_blk, else_blk): def cbranch(self, if_value, then_blk, else_blk):