Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r79587:38bdf715cb93
Date: 2015-09-10 14:48 +0200
http://bitbucket.org/pypy/pypy/changeset/38bdf715cb93/
Log: fix some more
diff --git a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
--- a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
@@ -414,11 +414,7 @@
guard_not_invalidated(descr=...)
p163 = force_token()
p164 = force_token()
- p165 = getarrayitem_gc(p67, 0, descr=<ArrayP .>)
- guard_value(p165, ConstPtr(ptr70), descr=...)
- p166 = getfield_gc(p165, descr=<FieldP
pypy.objspace.std.dictmultiobject.W_DictMultiObject.inst_strategy .+>)
- guard_value(p166, ConstPtr(ptr72), descr=...)
- p167 = call(ConstClass(_ll_0_alloc_with_del___), descr=<Callr . EF=5>)
+ p167 = call_r(ConstClass(_ll_0_alloc_with_del___), descr=<Callr .
EF=5>)
guard_no_exception(descr=...)
i112 = int_signext(i160, 2)
setfield_gc(p167, ConstPtr(ptr85), descr=<FieldP
pypy.module._cffi_backend.cdataobj.W_CData.inst_ctype .+>)
@@ -426,7 +422,7 @@
i114 = int_ne(i160, i112)
guard_false(i114, descr=...)
--TICK--
- i119 = call(ConstClass(_ll_1_raw_malloc_varsize__Signed), 6,
descr=<Calli . i EF=5 OS=110>)
+ i119 = call_i(ConstClass(_ll_1_raw_malloc_varsize__Signed), 6,
descr=<Calli . i EF=5 OS=110>)
raw_store(i119, 0, i160, descr=<ArrayS 2>)
raw_store(i119, 2, i160, descr=<ArrayS 2>)
raw_store(i119, 4, i160, descr=<ArrayS 2>)
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
@@ -21,10 +21,10 @@
assert loop.match_by_id("generator", """
cond_call(..., descr=...)
i16 = force_token()
- p45 = new_with_vtable(ConstClass(W_IntObject))
+ p45 = new_with_vtable(descr=<.*>)
+ ifoo = arraylen_gc(p8, descr=<ArrayP .*>)
setfield_gc(p45, i29, descr=<FieldS .*>)
setarrayitem_gc(p8, 0, p45, descr=<ArrayP .>)
- i47 = arraylen_gc(p8, descr=<ArrayP .>) # Should be removed by
backend
jump(..., descr=...)
""")
assert loop.match_by_id("subtract", """
@@ -50,10 +50,10 @@
assert loop.match_by_id("generator", """
cond_call(..., descr=...)
i16 = force_token()
- p45 = new_with_vtable(ConstClass(W_IntObject))
+ p45 = new_with_vtable(descr=<.*>)
+ i47 = arraylen_gc(p8, descr=<ArrayP .>) # Should be removed by
backend
setfield_gc(p45, i29, descr=<FieldS .*>)
setarrayitem_gc(p8, 0, p45, descr=<ArrayP .>)
- i47 = arraylen_gc(p8, descr=<ArrayP .>) # Should be removed by
backend
jump(..., descr=...)
""")
assert loop.match_by_id("subtract", """
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
