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

Fix: Object cache was removing objects properly.

Browse source 
Continue to update test to use unittest.
This commit is contained in:
Siu Kwan Lam 2012-07-21 15:57:39 -07:00
commit badac267cc
2 changed files with 84 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

5
llvm/__init__.py
View file

@ -128,8 +128,9 @@ class _ObjectCache(type):
@staticmethod @staticmethod
def forget(obj): def forget(obj):
objid = _core.PyCObjectVoidPtrToPyLong(obj.ptr) objid = _core.PyCObjectVoidPtrToPyLong(obj.ptr)
if objid in _ObjectCache.__instances: key = "%s:%d" % (type(obj).__name__, objid)
del _ObjectCache.__instances[objid] if key in _ObjectCache.__instances:
del _ObjectCache.__instances[key]
#===----------------------------------------------------------------------=== #===----------------------------------------------------------------------===

97
test/objcache.py
View file

@ -2,97 +2,92 @@
from llvm.core import * from llvm.core import *
def check(a, b): import logging, unittest
if a is b:
print("OK")
else:
print("FAIL")
def check_isnot(a, b): class TestObjCache(unittest.TestCase):
if not (a is b): def test_objcache(self):
print("OK") logging.debug("Testing module aliasing ..")
else:
print("FAIL")
print("Testing module aliasing ..", end=' ')
m1 = Module.new('a') m1 = Module.new('a')
t = Type.int() t = Type.int()
ft = Type.function(t, [t]) ft = Type.function(t, [t])
f1 = m1.add_function(ft, "func") f1 = m1.add_function(ft, "func")
m2 = f1.module m2 = f1.module
check(m1, m2) self.assertIs(m1, m2)
print("Testing global vairable aliasing 1 .. ", end=' ') logging.debug("Testing global vairable aliasing 1 .. ")
gv1 = GlobalVariable.new(m1, t, "gv") gv1 = GlobalVariable.new(m1, t, "gv")
gv2 = GlobalVariable.get(m1, "gv") gv2 = GlobalVariable.get(m1, "gv")
check(gv1, gv2) self.assertIs(gv1, gv2)
print("Testing global vairable aliasing 2 .. ", end=' ') logging.debug("Testing global vairable aliasing 2 .. ")
gv3 = m1.global_variables[0] gv3 = m1.global_variables[0]
check(gv1, gv3) self.assertIs(gv1, gv3)
logging.debug("Testing global vairable aliasing 3 .. ")
print("Testing global vairable aliasing 3 .. ", end=' ')
gv2 = None gv2 = None
gv3 = None gv3 = None
gv1.delete() gv1.delete()
gv4 = GlobalVariable.new(m1, t, "gv") gv4 = GlobalVariable.new(m1, t, "gv")
check_isnot(gv1, gv4)
print("Testing function aliasing 1 ..", end=' ') self.assertIsNot(gv1, gv4)
logging.debug("Testing function aliasing 1 ..")
b1 = f1.append_basic_block('entry') b1 = f1.append_basic_block('entry')
f2 = b1.function f2 = b1.function
check(f1, f2) self.assertIs(f1, f2)
print("Testing function aliasing 2 ..", end=' ') logging.debug("Testing function aliasing 2 ..")
f3 = m1.get_function_named("func") f3 = m1.get_function_named("func")
check(f1, f3) self.assertIs(f1, f3)
print("Testing function aliasing 3 ..", end=' ') logging.debug("Testing function aliasing 3 ..")
f4 = Function.get_or_insert(m1, ft, "func") f4 = Function.get_or_insert(m1, ft, "func")
check(f1, f4) self.assertIs(f1, f4)
print("Testing function aliasing 4 ..", end=' ') logging.debug("Testing function aliasing 4 ..")
f5 = Function.get(m1, "func") f5 = Function.get(m1, "func")
check(f1, f5) self.assertIs(f1, f5)
print("Testing function aliasing 5 ..", end=' ') logging.debug("Testing function aliasing 5 ..")
f6 = m1.get_or_insert_function(ft, "func") f6 = m1.get_or_insert_function(ft, "func")
check(f1, f6) self.assertIs(f1, f6)
print("Testing function aliasing 6 ..", end=' ') logging.debug("Testing function aliasing 6 ..")
f7 = m1.functions[0] f7 = m1.functions[0]
check(f1, f7) self.assertIs(f1, f7)
print("Testing argument aliasing .. ", end=' ') logging.debug("Testing argument aliasing .. ")
a1 = f1.args[0] a1 = f1.args[0]
a2 = f1.args[0] a2 = f1.args[0]
check(a1, a2) self.assertIs(a1, a2)
print("Testing basic block aliasing 1 .. ", end=' ') logging.debug("Testing basic block aliasing 1 .. ")
b2 = f1.basic_blocks[0] b2 = f1.basic_blocks[0]
check(b1, b2) self.assertIs(b1, b2)
print("Testing basic block aliasing 2 .. ", end=' ') logging.debug("Testing basic block aliasing 2 .. ")
b3 = f1.get_entry_basic_block() b3 = f1.get_entry_basic_block()
check(b1, b3) self.assertIs(b1, b3)
print("Testing basic block aliasing 3 .. ", end=' ') logging.debug("Testing basic block aliasing 3 .. ")
b31 = f1.entry_basic_block b31 = f1.entry_basic_block
check(b1, b31) self.assertIs(b1, b31)
print("Testing basic block aliasing 4 .. ", end=' ') logging.debug("Testing basic block aliasing 4 .. ")
bldr = Builder.new(b1) bldr = Builder.new(b1)
b4 = bldr.basic_block b4 = bldr.basic_block
check(b1, b4) self.assertIs(b1, b4)
print("Testing basic block aliasing 5 .. ", end=' ') logging.debug("Testing basic block aliasing 5 .. ")
i1 = bldr.ret_void() i1 = bldr.ret_void()
b5 = i1.basic_block b5 = i1.basic_block
check(b1, b5) self.assertIs(b1, b5)
print("Testing instruction aliasing 1 .. ", end=' ') logging.debug("Testing instruction aliasing 1 .. ")
i2 = b5.instructions[0] i2 = b5.instructions[0]
check(i1, i2) self.assertIs(i1, i2)
# phi node # phi node
phi = bldr.phi(t) phi = bldr.phi(t)
@ -100,9 +95,13 @@ phi.add_incoming(f1.args[0], b1)
v2 = phi.get_incoming_value(0) v2 = phi.get_incoming_value(0)
b6 = phi.get_incoming_block(0) b6 = phi.get_incoming_block(0)
print("Testing PHI / basic block aliasing 5 .. ", end=' ') logging.debug("Testing PHI / basic block aliasing 5 .. ")
check(b1, b6) self.assertIs(b1, b6)
print("Testing PHI / value aliasing .. ", end=' ') logging.debug("Testing PHI / value aliasing .. ")
check(f1.args[0], v2) self.assertIs(f1.args[0], v2)
if __name__ == '__main__':
unittest.main()