[pypy-commit] pypy jitframe-on-heap: this is the correct fix for recursion

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r60402:317214eeafaf
Date: 2013-01-23 23:08 +0200
http://bitbucket.org/pypy/pypy/changeset/317214eeafaf/

Log:	this is the correct fix for recursion

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -898,10 +898,8 @@
         oldadr = oldlooptoken._x86_function_addr
         target = newlooptoken._x86_function_addr
         # copy frame-info data
-        old_fi = oldlooptoken.compiled_loop_token.frame_info
         new_fi = newlooptoken.compiled_loop_token.frame_info
-        old_fi.jfi_frame_depth = max(old_fi.jfi_frame_depth,
-                                     new_fi.jfi_frame_depth)
+        oldlooptoken.compiled_loop_token.frame_info = new_fi
         mc = codebuf.MachineCodeBlockWrapper()
         mc.JMP(imm(target))
         if WORD == 4:         # keep in sync with prepare_loop()