Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult-unroll
Changeset: r78839:ac9bb32198ac
Date: 2015-08-06 22:09 +0200
http://bitbucket.org/pypy/pypy/changeset/ac9bb32198ac/
Log: fix one test in test_optimizebasic (with one still failing)
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
@@ -265,6 +265,9 @@
self.optimizations = optimizations
+ def force_op_from_preamble(self, op):
+ return op
+
def replace_guard(self, op, value):
assert isinstance(value, info.NonNullPtrInfo)
if value.last_guard_pos == -1:
@@ -323,7 +326,7 @@
return op in self.inparg_dict
def get_constant_box(self, box):
- box = self.get_box_replacement(box)
+ box = self.force_box(box)
if isinstance(box, Const):
return box
if (box.type == 'i' and box.get_forwarded() and
diff --git a/rpython/jit/metainterp/optimizeopt/pure.py
b/rpython/jit/metainterp/optimizeopt/pure.py
--- a/rpython/jit/metainterp/optimizeopt/pure.py
+++ b/rpython/jit/metainterp/optimizeopt/pure.py
@@ -147,13 +147,9 @@
return
# replace CALL_PURE with just CALL
- args = op.getarglist()
opnum = OpHelpers.call_for_descr(op.getdescr())
newop = self.optimizer.replace_op_with(op, opnum)
self.emit_operation(newop)
- #if self.optimizer.emitting_dissabled:
- # self.extra_call_pure.append(op) # XXX
- #else:
# don't move call_pure_with_exception in the short preamble...
# issue #2015
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
