[pypy-svn] pypy jit-virtual_state: Resume with correct live_boxes after retraced loop

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-virtual_state
Changeset: r41639:ec93501c0a52
Date: 2011-02-06 10:28 +0100
http://bitbucket.org/pypy/pypy/changeset/ec93501c0a52/

Log:	Resume with correct live_boxes after retraced loop

diff --git a/pypy/jit/metainterp/test/test_send.py b/pypy/jit/metainterp/test/test_send.py
--- a/pypy/jit/metainterp/test/test_send.py
+++ b/pypy/jit/metainterp/test/test_send.py
@@ -334,10 +334,6 @@
         class State:
             count = 0
             def externfn(self, n):
-                print
-                print
-                print n, 198 - self.count
-                print
                 assert n == 198 - self.count
                 self.count += 1
                 if n % 5:

diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -1913,7 +1913,8 @@
         self.history.inputargs = original_boxes[num_green_args:]
         greenkey = original_boxes[:num_green_args]
         self.history.record(rop.JUMP, live_arg_boxes[num_green_args:], None)
-        loop_token = compile.compile_new_loop(self, [], greenkey, start, start_resumedescr)
+        loop_token = compile.compile_new_loop(self, [], greenkey, start,
+                                              start_resumedescr)
         self.history.operations.pop()     # remove the JUMP
         if loop_token is None:
             return
@@ -1923,9 +1924,8 @@
 
         self.history.inputargs = original_inputargs
         self.history.operations = self.history.operations[:start]
-        live_arg_boxes = bridge_arg_boxes
         
-        self.history.record(rop.JUMP, live_arg_boxes[num_green_args:], None)
+        self.history.record(rop.JUMP, bridge_arg_boxes[num_green_args:], None)
         try:
             target_loop_token = compile.compile_new_bridge(self,
                                                            [loop_token],