[pypy-svn] r79349 - pypy/trunk/pypy/jit/metainterp/test
arigo at codespeak.net
arigo at codespeak.net
Mon Nov 22 17:48:23 CET 2010
Author: arigo
Date: Mon Nov 22 17:48:22 2010
New Revision: 79349
Modified:
pypy/trunk/pypy/jit/metainterp/test/test_exception.py
Log:
(antocuni, arigo)
Phew. Found out the origin of the bug we were tracking.
Modified: pypy/trunk/pypy/jit/metainterp/test/test_exception.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/test/test_exception.py (original)
+++ pypy/trunk/pypy/jit/metainterp/test/test_exception.py Mon Nov 22 17:48:22 2010
@@ -1,6 +1,6 @@
import py, sys
from pypy.jit.metainterp.test.test_basic import LLJitMixin, OOJitMixin
-from pypy.rlib.jit import JitDriver, OPTIMIZER_SIMPLE
+from pypy.rlib.jit import JitDriver, OPTIMIZER_SIMPLE, dont_look_inside
from pypy.rlib.rarithmetic import ovfcheck, LONG_BIT, intmask
from pypy.jit.codewriter.policy import StopAtXPolicy
@@ -588,6 +588,33 @@
res = self.interp_operations(f, [99])
assert res == 21
+ def test_bug_exc1_noexc_exc2(self):
+ myjitdriver = JitDriver(greens=[], reds=['i'])
+ @dont_look_inside
+ def rescall(i):
+ if i < 10:
+ raise KeyError
+ if i < 20:
+ return None
+ raise ValueError
+ def f(i):
+ while i < 30:
+ myjitdriver.can_enter_jit(i=i)
+ myjitdriver.jit_merge_point(i=i)
+ try:
+ rescall(i)
+ except KeyError:
+ assert i < 10
+ except ValueError:
+ assert i >= 20
+ else:
+ assert 10 <= i < 20
+ i += 1
+ return i
+ res = self.meta_interp(f, [0], inline=True)
+ assert res == 30
+
+
class MyError(Exception):
def __init__(self, n):
self.n = n
More information about the Pypy-commit
mailing list