[pypy-commit] pypy default: Workaroundish fix for now: don't use green fields here.

arigo noreply at buildbot.pypy.org
Tue Nov 1 15:17:45 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r48647:14f9d8d50de2
Date: 2011-11-01 15:17 +0100
http://bitbucket.org/pypy/pypy/changeset/14f9d8d50de2/

Log:	Workaroundish fix for now: don't use green fields here. Using a
	regular green variable is easy enough and more tested.

diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -169,9 +169,11 @@
             return
         self.running = True
         try:
+            pycode = self.pycode
             while True:
                 jitdriver.jit_merge_point(self=self, frame=frame,
-                                          results_w=results_w)
+                                          results_w=results_w,
+                                          pycode=pycode)
                 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:
@@ -182,5 +184,5 @@
             self.running = False
             self.frame = None
 
-jitdriver = jit.JitDriver(greens=['self.pycode'],
+jitdriver = jit.JitDriver(greens=['pycode'],
                           reds=['self', 'frame', 'results_w'])


More information about the pypy-commit mailing list