Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r95628:d0187cf2f1b7 Date: 2019-01-13 19:21 +0100 http://bitbucket.org/pypy/pypy/changeset/d0187cf2f1b7/
Log: Fix the tests for #2904 diff --git a/pypy/module/pypyjit/test_pypy_c/test_containers.py b/pypy/module/pypyjit/test_pypy_c/test_containers.py --- a/pypy/module/pypyjit/test_pypy_c/test_containers.py +++ b/pypy/module/pypyjit/test_pypy_c/test_containers.py @@ -20,7 +20,7 @@ assert log.result % 1000 == 0 loop, = log.loops_by_filename(self.filepath) ops = loop.ops_by_id('look') - assert log.opnames(ops) == [] + assert log.opnames(ops) == ['guard_nonnull_class'] def test_identitydict(self): def fn(n): diff --git a/pypy/module/pypyjit/test_pypy_c/test_instance.py b/pypy/module/pypyjit/test_pypy_c/test_instance.py --- a/pypy/module/pypyjit/test_pypy_c/test_instance.py +++ b/pypy/module/pypyjit/test_pypy_c/test_instance.py @@ -254,6 +254,7 @@ guard_no_exception(descr=...) i29 = int_lt(i26, 0) guard_true(i29, descr=...) + guard_nonnull_class(p58, ConstClass(W_IntObject), descr=...) ''') assert loop.match_by_id('loadattr2', "") # completely folded away diff --git a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py --- a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py +++ b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py @@ -243,6 +243,8 @@ f80 = raw_load_f(i67, i79, descr=<ArrayF 8>) i81 = int_add(i71, 1) --TICK-- + i92 = int_le(i33, _) + guard_true(i92, descr=...) jump(..., descr=...) """) @@ -282,6 +284,8 @@ f86 = float_add(f74, f85) i87 = int_add(i76, 1) --TICK-- + i98 = int_le(i36, _) + guard_true(i98, descr=...) jump(..., descr=...) """) @@ -389,6 +393,8 @@ assert log.result == [0.] * N loop, = log.loops_by_filename(self.filepath) assert loop.match(""" + i4 = int_lt(i91, 0) + guard_false(i4, descr=...) i92 = int_ge(i91, i37) guard_false(i92, descr=...) i93 = int_add(i91, 1) diff --git a/pypy/module/pypyjit/test_pypy_c/test_misc.py b/pypy/module/pypyjit/test_pypy_c/test_misc.py --- a/pypy/module/pypyjit/test_pypy_c/test_misc.py +++ b/pypy/module/pypyjit/test_pypy_c/test_misc.py @@ -113,6 +113,7 @@ i12 = int_is_true(i4) guard_true(i12, descr=...) guard_not_invalidated(descr=...) + guard_nonnull_class(p10, ConstClass(W_IntObject), descr=...) i10p = getfield_gc_i(p10, descr=...) i10 = int_mul_ovf(2, i10p) guard_no_overflow(descr=...) @@ -148,6 +149,8 @@ setfield_gc(p9, i17, descr=<.* .*W_XRangeIterator.inst_current .*>) guard_not_invalidated(descr=...) i18 = force_token() + i83 = int_lt(0, i14) + guard_true(i83, descr=...) i84 = int_sub(i14, 1) i21 = int_lt(i10, 0) guard_false(i21, descr=...) @@ -175,12 +178,16 @@ loop, = log.loops_by_filename(self.filepath) assert loop.match(""" guard_not_invalidated? + i80 = int_lt(i11, 0) + guard_false(i80, descr=...) i16 = int_ge(i11, i12) guard_false(i16, descr=...) i20 = int_add(i11, 1) setfield_gc(p4, i20, descr=<.* .*W_AbstractSeqIterObject.inst_index .*>) guard_not_invalidated? i21 = force_token() + i89 = int_lt(0, i9) + guard_true(i89, descr=...) i88 = int_sub(i9, 1) i25 = int_ge(i11, i9) guard_false(i25, descr=...) @@ -214,6 +221,8 @@ setfield_gc(p4, i20, descr=<.* .*W_AbstractSeqIterObject.inst_index .*>) guard_not_invalidated? i21 = force_token() + i94 = int_lt(0, i9) + guard_true(i94, descr=...) i95 = int_sub(i9, 1) i23 = int_lt(i18, 0) guard_false(i23, descr=...) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit