[pypy-svn] r79350 - in pypy/trunk/pypy/jit/metainterp: optimizeopt test

[arigo at codespeak.net]

Author: arigo
Date: Mon Nov 22 17:54:26 2010
New Revision: 79350

Modified:
   pypy/trunk/pypy/jit/metainterp/optimizeopt/optimizer.py
   pypy/trunk/pypy/jit/metainterp/test/test_optimizeopt.py
Log:
(antocuni, arigo)
Add another test.  Fix for r79349.


Modified: pypy/trunk/pypy/jit/metainterp/optimizeopt/optimizer.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/optimizeopt/optimizer.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/optimizeopt/optimizer.py	Mon Nov 22 17:54:26 2010
@@ -299,7 +299,9 @@
             return CVAL_ZERO
 
     def propagate_all_forward(self):
-        self.exception_might_have_happened = False
+        self.exception_might_have_happened = True
+        # ^^^ at least at the start of bridges.  For loops, we could set
+        # it to False, but we probably don't care
         self.newoperations = []
         self.i = 0
         while self.i < len(self.loop.operations):

Modified: pypy/trunk/pypy/jit/metainterp/test/test_optimizeopt.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/test/test_optimizeopt.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/test/test_optimizeopt.py	Mon Nov 22 17:54:26 2010
@@ -789,8 +789,12 @@
         i3 = call(i2, descr=nonwritedescr)
         jump(i1)       # the exception is considered lost when we loop back
         """
+        # note that 'guard_no_exception' at the very start must be kept
+        # around: bridges may start with one.  (In case of loops we could
+        # remove it, but we probably don't care.)
         expected = """
         [i]
+        guard_no_exception() []
         i1 = int_add(i, 3)
         i2 = call(i1, descr=nonwritedescr)
         guard_no_exception() [i1, i2]