Author: Richard Plangger <planri...@gmail.com>
Branch: 
Changeset: r85554:a09c99e17a27
Date: 2016-07-05 13:06 +0200
http://bitbucket.org/pypy/pypy/changeset/a09c99e17a27/

Log:    (s390x,ppc) resolve issue in test_gc_integration
        (test_malloc_slowpath), register allocator will not use register
        slots, but the frame slots on the gcmap

diff --git a/rpython/jit/backend/llsupport/test/test_gc_integration.py 
b/rpython/jit/backend/llsupport/test/test_gc_integration.py
--- a/rpython/jit/backend/llsupport/test/test_gc_integration.py
+++ b/rpython/jit/backend/llsupport/test/test_gc_integration.py
@@ -330,6 +330,13 @@
                 expected_size = 2
                 idx = 1
                 fixed_size -= 32
+            if self.cpu.backend_name.startswith('zarch') or \
+               self.cpu.backend_name.startswith('ppc'):
+                # the allocation always allocates the register
+                # into the return register. (e.g. r3 on ppc)
+                # the next malloc_nursery will move r3 to the
+                # frame manager, thus the two bits will be on the frame
+                fixed_size += 4
             assert len(frame.jf_gcmap) == expected_size
             # check that we have two bits set, and that they are in two
             # registers (p0 and p1 are moved away when doing p2, but not
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to