[pypy-commit] pypy default: fix fix fix

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r59789:90fcb923c94d
Date: 2013-01-05 22:42 +0200
http://bitbucket.org/pypy/pypy/changeset/90fcb923c94d/

Log:	fix fix fix

diff --git a/pypy/rlib/rgc.py b/pypy/rlib/rgc.py
--- a/pypy/rlib/rgc.py
+++ b/pypy/rlib/rgc.py
@@ -176,7 +176,10 @@
 
 @specialize.memo()
 def _contains_gcptr(TP):
+    TP = TP.OF
     if not isinstance(TP, lltype.Struct):
+        if isinstance(TP, lltype.Ptr) and TP.TO._gckind == 'gc':
+            return True
         return False
     for TP in TP._flds.itervalues():
         if isinstance(TP, lltype.Ptr) and TP.TO._gckind == 'gc':
@@ -205,8 +208,7 @@
 
     TP = lltype.typeOf(source).TO
     assert TP == lltype.typeOf(dest).TO
-    if isinstance(TP.OF, lltype.Ptr) and (TP.OF.TO._gckind == 'gc'
-                                          or _contains_gcptr(TP.OF.TO)):
+    if _contains_gcptr(TP):
         # perform a write barrier that copies necessary flags from
         # source to dest
         if not llop.gc_writebarrier_before_copy(lltype.Bool, source, dest,
diff --git a/pypy/rlib/test/test_rgc.py b/pypy/rlib/test/test_rgc.py
--- a/pypy/rlib/test/test_rgc.py
+++ b/pypy/rlib/test/test_rgc.py
@@ -159,12 +159,17 @@
     assert a2[2].y == 15
 
 def test__contains_gcptr():
-    assert not rgc._contains_gcptr(lltype.Signed)
-    assert not rgc._contains_gcptr(lltype.Struct('x', ('x', lltype.Signed)))
-    assert rgc._contains_gcptr(lltype.Struct('x', ('x', lltype.Signed),
-                           ('y', lltype.Ptr(lltype.GcArray(lltype.Signed)))))
-    assert rgc._contains_gcptr(lltype.Struct('x', ('x', lltype.Signed),
-                           ('y', llmemory.GCREF)))
+    assert not rgc._contains_gcptr(lltype.GcArray(lltype.Signed))
+    assert not rgc._contains_gcptr(lltype.GcArray(
+        lltype.Struct('x', ('x', lltype.Signed))))
+    assert rgc._contains_gcptr(lltype.GcArray(
+        lltype.Struct('x', ('x', lltype.Signed),
+                      ('y', lltype.Ptr(lltype.GcArray(lltype.Signed))))))
+    assert rgc._contains_gcptr(lltype.GcArray(
+        lltype.Struct('x', ('x', lltype.Signed),
+                      ('y', llmemory.GCREF))))
+    assert rgc._contains_gcptr(lltype.GcArray(lltype.Ptr(lltype.GcStruct('x'))))
+    assert not rgc._contains_gcptr(lltype.GcArray(lltype.Ptr(lltype.Struct('x'))))
 
 def test_ll_arraycopy_small():
     TYPE = lltype.GcArray(lltype.Signed)