Author: David Schneider <[email protected]>
Branch: release-2.1.x
Changeset: r65320:daf1b0412bfb
Date: 2013-07-10 06:55 -0500
http://bitbucket.org/pypy/pypy/changeset/daf1b0412bfb/
Log: ignore guard_not_invalidated in some more places
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -548,10 +548,10 @@
log = self.run(f, import_site=True)
loop, = log.loops_by_id('ntohs')
assert loop.match_by_id('ntohs', """
- guard_not_invalidated(descr=...)
p12 = call(ConstClass(ntohs), 1, descr=...)
guard_no_exception(descr=...)
- """)
+ """,
+ include_guard_not_invalidated=False)
#
py.test.raises(InvalidMatch, loop.match_by_id, 'ntohs', """
guard_not_invalidated(descr=...)
diff --git a/pypy/module/pypyjit/test_pypy_c/test_array.py
b/pypy/module/pypyjit/test_pypy_c/test_array.py
--- a/pypy/module/pypyjit/test_pypy_c/test_array.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_array.py
@@ -105,7 +105,6 @@
assert loop.match("""
i10 = int_lt(i6, 1000)
guard_true(i10, descr=...)
- guard_not_invalidated?
i11 = int_lt(i6, i7)
guard_true(i11, descr=...)
f13 = getarrayitem_raw(i8, i6, descr=<ArrayF 8>)
@@ -117,7 +116,7 @@
i20 = int_add(i6, 1)
--TICK--
jump(..., descr=...)
- """)
+ """, ignore_ops=['guard_not_invalidated'])
def test_array_of_floats(self):
try:
@@ -142,7 +141,6 @@
assert loop.match("""
i10 = int_lt(i6, 1000)
guard_true(i10, descr=...)
- guard_not_invalidated?
i11 = int_lt(i6, i7)
guard_true(i11, descr=...)
i13 = getarrayitem_raw(i8, i6, descr=<Array. 4>)
@@ -157,7 +155,7 @@
i23 = int_add(i6, 1)
--TICK--
jump(..., descr=...)
- """)
+ """, ignore_ops=['guard_not_invalidated'])
def test_zeropadded(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
