[pypy-svn] r60117 - pypy/branch/oo-jit/pypy/rpython/lltypesystem

[fijal at codespeak.net]

Author: fijal
Date: Mon Nov 24 16:36:35 2008
New Revision: 60117

Modified:
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/ll2ctypes.py
Log:
pass around rtyper


Modified: pypy/branch/oo-jit/pypy/rpython/lltypesystem/ll2ctypes.py
==============================================================================
--- pypy/branch/oo-jit/pypy/rpython/lltypesystem/ll2ctypes.py	(original)
+++ pypy/branch/oo-jit/pypy/rpython/lltypesystem/ll2ctypes.py	Mon Nov 24 16:36:35 2008
@@ -450,12 +450,12 @@
 _opaque_cache = {Dummy():0}
 _opaque_list = [Dummy()]
 
-def new_opaque_object(llobj):
+def new_opaque_object(rtyper, llobj):
     try:
         return _opaque_cache[llobj]
     except KeyError:
         assert len(_opaque_cache) == len(_opaque_list)
-        ctypes_type = get_ctypes_type(None, base_ptr_lltype())
+        ctypes_type = get_ctypes_type(rtyper, base_ptr_lltype())
         val = ctypes.cast(len(_opaque_cache), ctypes_type)
         _opaque_list.append(llobj)
         _opaque_cache[llobj] = val
@@ -475,7 +475,7 @@
             return get_ctypes_type(rtyper, T)()
 
         if T is base_ptr_lltype():
-            return new_opaque_object(llobj)
+            return new_opaque_object(rtyper, llobj)
         container = llobj._obj
         if isinstance(T.TO, lltype.FuncType):
             if hasattr(container, 'graph'):