Author: Richard Plangger <planri...@gmail.com>
Branch: vecopt-merge
Changeset: r79844:2002cf4fb7d3
Date: 2015-09-25 21:09 +0200
http://bitbucket.org/pypy/pypy/changeset/2002cf4fb7d3/
Log: parameter missing here, return value there, ... translation issues
:)
diff --git a/rpython/jit/metainterp/optimizeopt/dependency.py
b/rpython/jit/metainterp/optimizeopt/dependency.py
--- a/rpython/jit/metainterp/optimizeopt/dependency.py
+++ b/rpython/jit/metainterp/optimizeopt/dependency.py
@@ -999,7 +999,6 @@
# saves the next modification that uses a variable
self.next_nonconst = None
self.current_end = None
- self.opnum = 0
def stride_const(self):
return self.next_nonconst is None
diff --git a/rpython/jit/metainterp/optimizeopt/schedule.py
b/rpython/jit/metainterp/optimizeopt/schedule.py
--- a/rpython/jit/metainterp/optimizeopt/schedule.py
+++ b/rpython/jit/metainterp/optimizeopt/schedule.py
@@ -269,11 +269,11 @@
state.setvector_of_box(op,i,vecop)
if pack.is_accumulating():
state.renamer.start_renaming(op, vecop)
- if op.is_guard():
- assert isinstance(op, GuardResOp)
+ if left.is_guard():
+ assert isinstance(left, GuardResOp)
assert isinstance(vecop, GuardResOp)
- vecop.setfailargs(op.getfailargs())
- vecop.rd_snapshot = op.rd_snapshot
+ vecop.setfailargs(left.getfailargs())
+ vecop.rd_snapshot = left.rd_snapshot
def prepare_arguments(state, pack, args):
# Transforming one argument to a vector box argument
@@ -885,6 +885,6 @@
def is_accumulating(self):
return True
- def clone(self):
- return AccumPack(operations, self.operator, self.position)
+ def clone(self, oplist):
+ return AccumPack(oplist, self.operator, self.position)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
