Author: Hakan Ardo <[email protected]>
Branch: jit-optimizeopt-cleanups
Changeset: r47766:70e28f5386c4
Date: 2011-10-02 10:23 +0200
http://bitbucket.org/pypy/pypy/changeset/70e28f5386c4/
Log: setfields from forced virtuals now delayed a bit
diff --git a/pypy/module/pypyjit/test_pypy_c/test_call.py
b/pypy/module/pypyjit/test_pypy_c/test_call.py
--- a/pypy/module/pypyjit/test_pypy_c/test_call.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_call.py
@@ -366,12 +366,12 @@
# make sure that the "block" is not allocated
...
i20 = force_token()
- setfield_gc(p0, i20, descr=<SignedFieldDescr .*PyFrame.vable_token
.*>)
p22 = new_with_vtable(19511408)
p24 = new_array(1, descr=<GcPtrArrayDescr>)
p26 = new_with_vtable(ConstClass(W_ListObject))
p27 = new(descr=<SizeDescr .*>)
p29 = new_array(0, descr=<GcPtrArrayDescr>)
+ setfield_gc(p0, i20, descr=<SignedFieldDescr .*PyFrame.vable_token
.*>)
setfield_gc(p27, p29, descr=<GcPtrFieldDescr list.items .*>)
setfield_gc(p26, p27, descr=<.* .*W_ListObject.inst_wrappeditems
.*>)
setarrayitem_gc(p24, 0, p26, descr=<GcPtrArrayDescr>)
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
@@ -19,8 +19,8 @@
assert loop.match_by_id("generator", """
i16 = force_token()
p45 = new_with_vtable(ConstClass(W_IntObject))
- setfield_gc(p45, i29, descr=<SignedFieldDescr .*>)
i47 = arraylen_gc(p8, descr=<GcPtrArrayDescr>) # Should be removed
by backend
setarrayitem_gc(p8, 0, p45, descr=<GcPtrArrayDescr>)
+ setfield_gc(p45, i29, descr=<SignedFieldDescr .*>)
jump(..., descr=...)
""")
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
@@ -125,8 +125,8 @@
i12 = force_token()
--TICK--
p20 = new_with_vtable(ConstClass(W_IntObject))
+ setfield_gc(ConstPtr(ptr21), p20, descr=<GcPtrFieldDescr
.*TypeCell.inst_w_value .*>)
setfield_gc(p20, i11,
descr=<SignedFieldDescr.*W_IntObject.inst_intval .*>)
- setfield_gc(ConstPtr(ptr21), p20, descr=<GcPtrFieldDescr
.*TypeCell.inst_w_value .*>)
jump(p0, p1, p2, p3, p4, p20, p6, i7, p20, descr=<Loop.>)
""")
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
