Author: Maciej Fijalkowski <[email protected]>
Branch: result-in-resops
Changeset: r57566:f12e3ecb63e9
Date: 2012-09-25 12:12 +0200
http://bitbucket.org/pypy/pypy/changeset/f12e3ecb63e9/
Log: reintroduce InvalidLoop and fix the test
diff --git a/pypy/jit/metainterp/optimizeopt/rewrite.py
b/pypy/jit/metainterp/optimizeopt/rewrite.py
--- a/pypy/jit/metainterp/optimizeopt/rewrite.py
+++ b/pypy/jit/metainterp/optimizeopt/rewrite.py
@@ -196,9 +196,9 @@
if value.is_constant():
box = value.op
assert isinstance(box, Const)
- #if not box.same_constant(constbox):
- # raise Exception('A GUARD_{VALUE,TRUE,FALSE} was proven to' +
- # 'always fail')
+ if not box.same_constant(constbox):
+ raise InvalidLoop('A GUARD_{VALUE,TRUE,FALSE} was proven to' +
+ 'always fail')
return
if emit_operation:
self.emit_operation(op)
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -558,7 +558,7 @@
[i0]
guard_value(i0, 2) []
i = int_add(5, i0)
- guard_value(i, 8) []
+ guard_value(i, 7) []
jump(i0)
"""
expected = """
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
