Author: Carl Friedrich Bolz <[email protected]>
Branch: guard-compatible
Changeset: r83042:eed34dd847a5
Date: 2016-03-14 15:28 +0000
http://bitbucket.org/pypy/pypy/changeset/eed34dd847a5/
Log: translation fixes
diff --git a/rpython/jit/metainterp/compatible.py
b/rpython/jit/metainterp/compatible.py
--- a/rpython/jit/metainterp/compatible.py
+++ b/rpython/jit/metainterp/compatible.py
@@ -1,4 +1,5 @@
from rpython.jit.metainterp.history import newconst
+from rpython.jit.codewriter import longlong
def do_call(cpu, argboxes, descr):
from rpython.jit.metainterp.history import INT, REF, FLOAT, VOID
diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py
b/rpython/jit/metainterp/optimizeopt/rewrite.py
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -419,7 +419,7 @@
if old_guard_op.getopnum() == rop.GUARD_COMPATIBLE:
if not old_guard_op.getarg(1).same_constant(op.getarg(1)):
r1 = self.optimizer.metainterp_sd.logger_ops.repr_of_resop(op)
- r2 =
self.optimizer.metainterp_sd.logger_ops.repr_of_resop(old_guard)
+ r2 =
self.optimizer.metainterp_sd.logger_ops.repr_of_resop(old_guard_op)
raise InvalidLoop('a GUARD_COMPATIBLE (%s) is inconsistent '
'with a GUARD_VALUE (%s)' % (r1, r2))
descr = compile.ResumeGuardDescr()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
