aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Rigo <arigo@tunes.org>2011-11-01 11:56:20 +0100
committerArmin Rigo <arigo@tunes.org>2011-11-01 11:56:20 +0100
commita91b057fd86f260bdf69abbb1376b0ab1b0e46bb (patch)
treeb773767d522127f48abbfd5c0e620e97314396ac /pypy/interpreter/generator.py
parentbah. (diff)
downloadpypy-a91b057fd86f260bdf69abbb1376b0ab1b0e46bb.tar.gz
pypy-a91b057fd86f260bdf69abbb1376b0ab1b0e46bb.tar.bz2
pypy-a91b057fd86f260bdf69abbb1376b0ab1b0e46bb.zip
Tweaks.
Diffstat (limited to 'pypy/interpreter/generator.py')
-rw-r--r--pypy/interpreter/generator.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
index 101537ffea..ff456be9c4 100644
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -171,7 +171,8 @@ return next yielded value or raise StopIteration."""
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 @@ return next yielded value or raise StopIteration."""
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'])