[pypy-svn] r28323 - pypy/dist/pypy/rpython/lltypesystem

ac at codespeak.net ac at codespeak.net
Mon Jun 5 12:53:46 CEST 2006


Author: ac
Date: Mon Jun  5 12:53:45 2006
New Revision: 28323

Modified:
   pypy/dist/pypy/rpython/lltypesystem/llmemory.py
Log:
Fix id() when run on memorysimulator.

Modified: pypy/dist/pypy/rpython/lltypesystem/llmemory.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/llmemory.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/llmemory.py	Mon Jun  5 12:53:45 2006
@@ -484,7 +484,8 @@
         if ob is not None:
             self.ref = weakref.ref(ob)
             # umpf
-            if isinstance(ob, lltype._ptr):
+            from pypy.rpython.memory import lltypesimulation
+            if isinstance(ob, (lltype._ptr,lltypesimulation.simulatorptr)):
                 self.id = ob._cast_to_int()
             else:
                 self.id = id(ob)



More information about the Pypy-commit mailing list