Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: gc_no_cleanup_nursery
Changeset: r73696:dfca3fe04235
Date: 2014-09-25 11:41 +0200
http://bitbucket.org/pypy/pypy/changeset/dfca3fe04235/
Log: fix
diff --git a/rpython/jit/backend/llsupport/test/test_rewrite.py
b/rpython/jit/backend/llsupport/test/test_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_rewrite.py
@@ -604,7 +604,7 @@
self.gc_ll_descr.max_size_of_young_obj = 2000
self.check_rewrite("""
[i2, p3]
- p1 = new_array(129, descr=cdescr)
+ p1 = new_array_clear(129, descr=cdescr)
call(123456)
setarrayitem_gc(p1, i2, p3, descr=cdescr)
jump()
@@ -626,7 +626,7 @@
self.gc_ll_descr.max_size_of_young_obj = 2000
self.check_rewrite("""
[i2, p3]
- p1 = new_array(130, descr=cdescr)
+ p1 = new_array_clear(130, descr=cdescr)
call(123456)
setarrayitem_gc(p1, i2, p3, descr=cdescr)
jump()
@@ -658,7 +658,7 @@
def test_label_makes_size_unknown(self):
self.check_rewrite("""
[i2, p3]
- p1 = new_array(5, descr=cdescr)
+ p1 = new_array_clear(5, descr=cdescr)
label(p1, i2, p3)
setarrayitem_gc(p1, i2, p3, descr=cdescr)
jump()
@@ -738,7 +738,6 @@
%(cdescr.basesize + 5 * cdescr.itemsize)d)
setfield_gc(p0, 8111, descr=tiddescr)
setfield_gc(p0, 5, descr=clendescr)
- zero_array(p0, 0, 5, descr=cdescr)
setarrayitem_gc(p0, i2, p1, descr=cdescr)
jump()
""")
diff --git a/rpython/jit/backend/x86/regalloc.py
b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -316,7 +316,7 @@
self.assembler.mc.mark_op(op)
self.rm.position = i
self.xrm.position = i
- if op.has_no_side_effect() and op.result not in self.longevit:
+ if op.has_no_side_effect() and op.result not in self.longevity:
i += 1
self.possibly_free_vars_for_op(op)
continue
diff --git a/rpython/jit/metainterp/test/test_dict.py
b/rpython/jit/metainterp/test/test_dict.py
--- a/rpython/jit/metainterp/test/test_dict.py
+++ b/rpython/jit/metainterp/test/test_dict.py
@@ -168,7 +168,7 @@
res = self.meta_interp(f, [100], listops=True)
assert res == f(50)
- self.check_resops({'new_array': 2, 'getfield_gc': 2,
+ self.check_resops({'new_array_clear': 2, 'getfield_gc': 2,
'guard_true': 2, 'jump': 1,
'new_with_vtable': 2, 'getinteriorfield_gc': 2,
'setfield_gc': 8, 'int_gt': 2, 'int_sub': 2,
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
