[pypy-svn] r65185 - pypy/branch/pyjitpl5/pypy/rpython/lltypesystem

arigo at codespeak.net arigo at codespeak.net
Sat May 9 17:12:31 CEST 2009


Author: arigo
Date: Sat May  9 17:12:31 2009
New Revision: 65185

Modified:
   pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/llmemory.py
Log:
Fix for the JIT: test_zrpy_recursive.py.


Modified: pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/llmemory.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/llmemory.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/llmemory.py	Sat May  9 17:12:31 2009
@@ -416,11 +416,14 @@
 
     def __eq__(self, other):
         if isinstance(other, fakeaddress):
-            obj1 = self._fixup().ptr
-            obj2 = other._fixup().ptr
-            if obj1 is not None: obj1 = obj1._obj
-            if obj2 is not None: obj2 = obj2._obj
-            return obj1 == obj2
+            try:
+                obj1 = self._fixup().ptr
+                obj2 = other._fixup().ptr
+                if obj1 is not None: obj1 = obj1._obj
+                if obj2 is not None: obj2 = obj2._obj
+                return obj1 == obj2
+            except lltype.DelayedPointer:
+                return self.ptr is other.ptr
         else:
             return NotImplemented
 



More information about the Pypy-commit mailing list