[pypy-svn] r74942 - pypy/branch/blackhole-improvement/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Mon May 31 00:34:42 2010
New Revision: 74942

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/pyjitpl.py
Log:
Fix the bug of r74941.


Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/pyjitpl.py	Mon May 31 00:34:42 2010
@@ -1287,6 +1287,8 @@
         self.free_frames_list.append(frame)
 
     def finishframe(self, resultbox):
+        # handle a non-exceptional return from the current frame
+        self.last_exc_value_box = None
         self.popframe()
         if self.framestack:
             self.framestack[-1].make_result_of_lastop(resultbox)