Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r50479:a425bfb85325 Date: 2011-12-13 21:28 +0000 http://bitbucket.org/pypy/pypy/changeset/a425bfb85325/
Log: Merge heads. This new old version of test_generators still fails. diff --git a/pypy/module/pypyjit/test_pypy_c/test_generators.py b/pypy/module/pypyjit/test_pypy_c/test_generators.py --- a/pypy/module/pypyjit/test_pypy_c/test_generators.py +++ b/pypy/module/pypyjit/test_pypy_c/test_generators.py @@ -6,6 +6,8 @@ def main(n): def f(): for i in range(10000): + i -= 1 + i -= 42 # ID: subtract yield i def g(): @@ -26,3 +28,8 @@ i47 = arraylen_gc(p8, descr=<GcPtrArrayDescr>) # Should be removed by backend jump(..., descr=...) """) + assert loop.match_by_id("subtract", """ + setfield_gc(p7, 35, descr=<.*last_instr .*>) # XXX bad, kill me + i2 = int_sub_ovf(i1, 42) + guard_no_overflow(descr=...) + """) _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit