[pypy-commit] pypy stmgc-c4: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c4
Changeset: r66800:fb08fabf15b6
Date: 2013-09-05 15:34 +0200
http://bitbucket.org/pypy/pypy/changeset/fb08fabf15b6/

Log:	merge heads

diff --git a/rpython/jit/backend/llsupport/test/zrpy_gc_test.py b/rpython/jit/backend/llsupport/test/zrpy_gc_test.py
--- a/rpython/jit/backend/llsupport/test/zrpy_gc_test.py
+++ b/rpython/jit/backend/llsupport/test/zrpy_gc_test.py
@@ -860,13 +860,14 @@
             while a.i:
                 driver.jit_merge_point(a=a)
                 a.i -= 1
-            print a.v
         
         def f(n, x, x0, x1, x2, x3, x4, x5, x6, x7, l, s):
             u = lltype.malloc(S)
             u.i = 10000
             u.v = n
             inner(u)
+            assert u.i == 0
+            assert u.v == n
                 
             return n - 1, x, x0, x1, x2, x3, x4, x5, x6, x7, l, s