[pypy-commit] pypy default: Tweaks.

arigo noreply at buildbot.pypy.org
Tue Nov 1 13:04:21 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r48645:f9317d8169dd
Date: 2011-11-01 11:56 +0100
http://bitbucket.org/pypy/pypy/changeset/f9317d8169dd/

Log:	Tweaks.

diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -171,7 +171,8 @@
         self.running = True
         try:
             while True:
-                jitdriver.jit_merge_point(frame=frame)
+                jitdriver.jit_merge_point(self=self, frame=frame,
+                                          results_w=results_w)
                 w_result = frame.execute_frame(space.w_None)
                 # if the frame is now marked as finished, it was RETURNed from
                 if frame.frame_finished_execution:
@@ -183,4 +184,5 @@
             self.frame = None
         return results_w
 
-jitdriver = jit.JitDriver(greens=['frame.pycode'], reds=['frame'])
+jitdriver = jit.JitDriver(greens=['self.pycode'],
+                          reds=['self', 'frame', 'results_w'])


More information about the pypy-commit mailing list