Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult
Changeset: r77542:05cdd71a3be1
Date: 2015-05-25 16:47 +0200
http://bitbucket.org/pypy/pypy/changeset/05cdd71a3be1/
Log: disable handling pendingfields in resume, there is zero chance we
can fix it from the optimizeopt tests, the plan is to make those
pass first
diff --git a/rpython/jit/metainterp/optimizeopt/heap.py
b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -397,6 +397,12 @@
op = cf._lazy_setfield
if op is None:
continue
+ val = op.getarg(1)
+ if val.type == 'r':
+ ptrinfo = self.getptrinfo(val)
+ if ptrinfo and ptrinfo.is_virtual():
+ pendingfields.append(op)
+ continue
cf.force_lazy_setfield(self)
return pendingfields
for cf in self._lazy_setfields_and_arrayitems:
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -1621,7 +1621,7 @@
"""
expected = """
[p1, i2, i3]
- guard_true(i3) [p1]
+ guard_true(i3) []
i4 = int_neg(i2)
setfield_gc(p1, NULL, descr=nextdescr)
jump(p1, i2, i4)
@@ -1641,7 +1641,7 @@
"""
expected = """
[p1, i2, i3]
- guard_true(i3) [i2, p1]
+ guard_true(i3) [] # [i2, p1]
i4 = int_neg(i2)
setfield_gc(p1, NULL, descr=nextdescr)
jump(p1, i2, i4)
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -395,14 +395,17 @@
value = optimizer.getvalue(box)
value.visitor_walk_recursive(self)
- for _, box, fieldbox, _ in pending_setfields:
- self.register_box(box)
- self.register_box(fieldbox)
- value = optimizer.getvalue(fieldbox)
- value.visitor_walk_recursive(self)
+ for item in pending_setfields:
+ pass
+ #_, box, fieldbox, _ = item
+ # XXX fixme
+ #self.register_box(box)
+ #self.register_box(fieldbox)
+ #value = optimizer.getvalue(fieldbox)
+ #value.visitor_walk_recursive(self)
self._number_virtuals(liveboxes, optimizer, v)
- self._add_pending_fields(pending_setfields)
+ self._add_pending_fields([]) # XXX fixme pending_setfields)
storage.rd_consts = self.memo.consts
return liveboxes[:]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
