[pypy-commit] pypy invalidate-virtualrefs: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: invalidate-virtualrefs
Changeset: r44548:d5fe549a13ea
Date: 2011-05-27 14:35 +0200
http://bitbucket.org/pypy/pypy/changeset/d5fe549a13ea/

Log:	merge heads

diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -261,8 +261,7 @@
         """
         from pypy.interpreter.pytraceback import PyTraceback
         tb = self._application_traceback
-        if tb is not None:
-            assert isinstance(tb, PyTraceback)
+        if tb is not None and isinstance(tb, PyTraceback):
             tb.frame.mark_as_escaped()
         return tb
 
diff --git a/pypy/objspace/trace.py b/pypy/objspace/trace.py
--- a/pypy/objspace/trace.py
+++ b/pypy/objspace/trace.py
@@ -110,10 +110,10 @@
         self.result.append(EnterFrame(frame))
         self.ec.enter(frame)
 
-    def leave(self, frame, w_exitvalue):
+    def leave(self, frame, w_exitvalue, got_exception):
         """ called just after evaluating of a frame is suspended/finished. """
         self.result.append(LeaveFrame(frame))
-        self.ec.leave(frame, w_exitvalue)
+        self.ec.leave(frame, w_exitvalue, got_exception)
 
     def bytecode_trace(self, frame):
         """ called just before execution of a bytecode. """