Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult-unroll
Changeset: r79148:d8b3b12ad45c
Date: 2015-08-23 11:03 +0200
http://bitbucket.org/pypy/pypy/changeset/d8b3b12ad45c/
Log: reenable inputargs checking (maybe?)
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py
b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -340,7 +340,6 @@
return op
def is_inputarg(self, op):
- return True
return op in self.inparg_dict
def get_constant_box(self, box):
@@ -483,9 +482,9 @@
new_arg = OpHelpers.inputarg_from_tp(inparg.type)
inparg.set_forwarded(new_arg)
newargs.append(new_arg)
+ self.init_inparg_dict_from(newargs)
else:
newargs = inputargs
- self.init_inparg_dict_from(newargs)
self.call_pure_results = call_pure_results
if ops[-1].getopnum() in (rop.FINISH, rop.JUMP):
last = len(ops) - 1
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
@@ -105,6 +105,7 @@
self.potential_extra_ops = {}
label_args = state.virtual_state.make_inputargs(
start_label.getarglist(), self.optimizer)
+ self.optimizer.init_inparg_dict_from(label_args)
self.optimizer.propagate_all_forward(start_label.getarglist()[:], ops,
call_pure_results, False)
orig_jump_args = [self.get_box_replacement(op)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
