Author: Maciej Fijalkowski <[email protected]>
Branch: optresult-unroll
Changeset: r78359:190358328d5b
Date: 2015-06-30 12:18 +0200
http://bitbucket.org/pypy/pypy/changeset/190358328d5b/
Log: fix, I think
diff --git a/rpython/jit/metainterp/optimizeopt/intbounds.py
b/rpython/jit/metainterp/optimizeopt/intbounds.py
--- a/rpython/jit/metainterp/optimizeopt/intbounds.py
+++ b/rpython/jit/metainterp/optimizeopt/intbounds.py
@@ -117,8 +117,8 @@
self.getintbound(op).intersect(b)
def optimize_INT_ADD(self, op):
- arg1 = op.getarg(0)
- arg2 = op.getarg(1)
+ arg1 = self.get_box_replacement(op.getarg(0))
+ arg2 = self.get_box_replacement(op.getarg(1))
v1 = self.getintbound(arg1)
v2 = self.getintbound(arg2)
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py
b/rpython/jit/metainterp/optimizeopt/test/test_util.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_util.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py
@@ -464,6 +464,7 @@
assert loop.operations[0].getopnum() == rop.LABEL
loop.inputargs = loop.operations[0].getarglist()
+ start_state.orig_inputargs = inputargs
self._do_optimize_loop(loop, call_pure_results, start_state,
export_state=False)
extra_same_as = []
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py
b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -300,6 +300,8 @@
self.short_boxes = exported_state.short_boxes
self.initial_virtual_state = target_token.virtual_state
+ for i, arg in enumerate(exported_state.orig_inputargs):
+ arg.set_forwarded(self.inputargs[i])
for box in self.inputargs:
preamble_info = exported_state.exported_values[box]
self.optimizer.setinfo_from_preamble(box, preamble_info)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
