[pypy-commit] pypy guard-compatible: translation fixes

[cfbolz]

Author: Carl Friedrich Bolz 
Branch: guard-compatible
Changeset: r85427:c1d4078e392b
Date: 2016-06-24 17:31 +0200
http://bitbucket.org/pypy/pypy/changeset/c1d4078e392b/

Log:translation fixes

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
@@ -88,6 +88,7 @@
 if preamble_info._compatibility_conditions:
 info_in_loop = op.get_forwarded()
 if info_in_loop is not None:
+assert isinstance(info_in_loop, info.PtrInfo)
 ccond = preamble_info._compatibility_conditions
 ccond = ccond.frozen_copy()
 info_in_loop._compatibility_conditions = ccond
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py 
b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -1,7 +1,7 @@
 from rpython.jit.metainterp.walkvirtual import VirtualVisitor
 from rpython.jit.metainterp.history import ConstInt, ConstPtr, ConstFloat
 from rpython.jit.metainterp.optimizeopt.info import ArrayPtrInfo,\
- ArrayStructInfo, AbstractStructPtrInfo
+ ArrayStructInfo, AbstractStructPtrInfo, PtrInfo
 from rpython.jit.metainterp.optimizeopt.intutils import \
  MININT, MAXINT, IntBound, IntLowerBound
 from rpython.jit.metainterp.resoperation import rop, ResOperation,\
@@ -355,6 +355,7 @@
 if type == 'i':
 return NotVirtualStateInfoInt(cpu, type, info)
 if type == 'r':
+assert isinstance(info, PtrInfo)
 if info is not None and info._compatibility_conditions is not None:
 return NotVirtualStateInfoPtrCompatible(cpu, type, info)
 return NotVirtualStateInfoPtr(cpu, type, info)
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy guard-compatible: translation fixes

[cfbolz]

Author: Carl Friedrich Bolz 
Branch: guard-compatible
Changeset: r83042:eed34dd847a5
Date: 2016-03-14 15:28 +
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
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit