Author: Maciej Fijalkowski <[email protected]>
Branch: share-guard-info
Changeset: r79754:2ffbdb25990c
Date: 2015-09-22 11:27 +0200
http://bitbucket.org/pypy/pypy/changeset/2ffbdb25990c/
Log: fix some tests
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
@@ -401,7 +401,7 @@
r = self.optimizer.metainterp_sd.logger_ops.repr_of_resop(op)
raise InvalidLoop('A GUARD_VALUE (%s) was proven to '
'always fail' % r)
- descr = compile.ResumeGuardValueDescr()
+ descr = compile.ResumeGuardDescr()
op = old_guard_op.copy_and_change(rop.GUARD_VALUE,
args = [old_guard_op.getarg(0), op.getarg(1)],
descr = descr)
@@ -453,7 +453,7 @@
if old_guard_op.getopnum() == rop.GUARD_NONNULL:
# it was a guard_nonnull, which we replace with a
# guard_nonnull_class.
- descr = compile.ResumeGuardNonnullClassDescr()
+ descr = compile.ResumeGuardDescr()
op = old_guard_op.copy_and_change (rop.GUARD_NONNULL_CLASS,
args = [old_guard_op.getarg(0), op.getarg(1)],
descr=descr)
diff --git a/rpython/jit/metainterp/test/test_ajit.py
b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -2628,7 +2628,10 @@
node2.val = 7
if a >= 100:
sa += 1
- sa += ovfcheck(i + i)
+ try:
+ sa += ovfcheck(i + i)
+ except OverflowError:
+ assert 0
node1 = A(i)
i += 1
assert self.meta_interp(f, [20, 7]) == f(20, 7)
@@ -3898,7 +3901,6 @@
def dec(self):
return Int(self.a - 1)
-
class Float(Base):
def __init__(self, a):
self.a = a
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
