[pypy-svn] r68681 - in pypy/branch/warmspot-jitinfo/pypy/rpython/memory: . test

[arigo at codespeak.net]

Author: arigo
Date: Wed Oct 21 15:04:38 2009
New Revision: 68681

Modified:
   pypy/branch/warmspot-jitinfo/pypy/rpython/memory/gctypelayout.py
   pypy/branch/warmspot-jitinfo/pypy/rpython/memory/test/test_gctypelayout.py
Log:
Support 'immutable_fields' here too.


Modified: pypy/branch/warmspot-jitinfo/pypy/rpython/memory/gctypelayout.py
==============================================================================
--- pypy/branch/warmspot-jitinfo/pypy/rpython/memory/gctypelayout.py	(original)
+++ pypy/branch/warmspot-jitinfo/pypy/rpython/memory/gctypelayout.py	Wed Oct 21 15:04:38 2009
@@ -350,11 +350,16 @@
 def gc_pointers_inside(v, adr, mutable_only=False):
     t = lltype.typeOf(v)
     if isinstance(t, lltype.Struct):
-        if mutable_only and t._hints.get('immutable'):
-            return
+        skip = ()
+        if mutable_only:
+            if t._hints.get('immutable'):
+                return
+            if 'immutable_fields' in t._hints:
+                skip = t._hints['immutable_fields'].fields
         for n, t2 in t._flds.iteritems():
             if isinstance(t2, lltype.Ptr) and t2.TO._gckind == 'gc':
-                yield adr + llmemory.offsetof(t, n)
+                if n not in skip:
+                    yield adr + llmemory.offsetof(t, n)
             elif isinstance(t2, (lltype.Array, lltype.Struct)):
                 for a in gc_pointers_inside(getattr(v, n),
                                             adr + llmemory.offsetof(t, n),

Modified: pypy/branch/warmspot-jitinfo/pypy/rpython/memory/test/test_gctypelayout.py
==============================================================================
--- pypy/branch/warmspot-jitinfo/pypy/rpython/memory/test/test_gctypelayout.py	(original)
+++ pypy/branch/warmspot-jitinfo/pypy/rpython/memory/test/test_gctypelayout.py	Wed Oct 21 15:04:38 2009
@@ -1,7 +1,8 @@
 import py
 from pypy.rpython.memory.gctypelayout import TypeLayoutBuilder, GCData
 from pypy.rpython.memory.gctypelayout import offsets_to_gc_pointers
-from pypy.rpython.lltypesystem import lltype, rclass
+from pypy.rpython.memory.gctypelayout import gc_pointers_inside
+from pypy.rpython.lltypesystem import lltype, llmemory, rclass
 from pypy.rpython.test.test_llinterp import get_interpreter
 from pypy.objspace.flow.model import Constant
 
@@ -90,3 +91,31 @@
     interp, graph = get_interpreter(f, [], backendopt=True)
     assert interp.eval_graph(graph, []) == 11001
     assert graph.startblock.exits[0].args == [Constant(11001, lltype.Signed)]
+
+def test_gc_pointers_inside():
+    from pypy.rpython import rclass
+    PT = lltype.Ptr(lltype.GcStruct('T'))
+    S1 = lltype.GcStruct('S', ('x', PT), ('y', PT))
+    S2 = lltype.GcStruct('S', ('x', PT), ('y', PT),
+                         hints={'immutable': True})
+    accessor = rclass.FieldListAccessor()
+    S3 = lltype.GcStruct('S', ('x', PT), ('y', PT),
+                         hints={'immutable_fields': accessor})
+    accessor.initialize(S3, ['x'])
+    #
+    s1 = lltype.malloc(S1)
+    adr = llmemory.cast_ptr_to_adr(s1)
+    lst = list(gc_pointers_inside(s1._obj, adr, mutable_only=True))
+    expected = [adr + llmemory.offsetof(S1, 'x'),
+                adr + llmemory.offsetof(S1, 'y')]
+    assert lst == expected or lst == expected[::-1]
+    #
+    s2 = lltype.malloc(S2)
+    adr = llmemory.cast_ptr_to_adr(s2)
+    lst = list(gc_pointers_inside(s2._obj, adr, mutable_only=True))
+    assert lst == []
+    #
+    s3 = lltype.malloc(S3)
+    adr = llmemory.cast_ptr_to_adr(s3)
+    lst = list(gc_pointers_inside(s3._obj, adr, mutable_only=True))
+    assert lst == [adr + llmemory.offsetof(S3, 'y')]