[pypy-svn] r68317 - in pypy/trunk/pypy/rpython: lltypesystem memory/gctransform

[arigo at codespeak.net]

Author: arigo
Date: Sun Oct 11 16:45:29 2009
New Revision: 68317

Modified:
   pypy/trunk/pypy/rpython/lltypesystem/llgroup.py
   pypy/trunk/pypy/rpython/memory/gctransform/framework.py
Log:
Fixes for jit/backend/llsupport/test/test_gc.


Modified: pypy/trunk/pypy/rpython/lltypesystem/llgroup.py
==============================================================================
--- pypy/trunk/pypy/rpython/lltypesystem/llgroup.py	(original)
+++ pypy/trunk/pypy/rpython/lltypesystem/llgroup.py	Sun Oct 11 16:45:29 2009
@@ -93,6 +93,9 @@
         self.lowpart = lowpart
         self.rest = rest
 
+    def __repr__(self):
+        return '<CombinedSymbolic %r|%s>' % (self.lowpart, self.rest)
+
     def __and__(self, other):
         if (other & 0xFFFF) == 0:
             return self.rest & other
@@ -111,3 +114,17 @@
     def __sub__(self, other):
         assert (other & 0xFFFF) == 0
         return CombinedSymbolic(self.lowpart, self.rest - other)
+
+    def __eq__(self, other):
+        if (isinstance(other, CombinedSymbolic) and
+            self.lowpart is other.lowpart):
+            return self.rest == other.rest
+        else:
+            return NotImplemented
+
+    def __ne__(self, other):
+        if (isinstance(other, CombinedSymbolic) and
+            self.lowpart is other.lowpart):
+            return self.rest != other.rest
+        else:
+            return NotImplemented

Modified: pypy/trunk/pypy/rpython/memory/gctransform/framework.py
==============================================================================
--- pypy/trunk/pypy/rpython/memory/gctransform/framework.py	(original)
+++ pypy/trunk/pypy/rpython/memory/gctransform/framework.py	Sun Oct 11 16:45:29 2009
@@ -919,7 +919,10 @@
     # for the JIT: currently does not support removetypeptr
     def __init__(self, config):
         from pypy.rpython.memory.gc.base import choose_gc_from_config
-        assert not config.translation.gcconfig.removetypeptr
+        try:
+            assert not config.translation.gcconfig.removetypeptr
+        except AttributeError:    # for some tests
+            pass
         GCClass, _ = choose_gc_from_config(config)
         TransformerLayoutBuilder.__init__(self, GCClass, {})