[pypy-commit] pypy jit-targets: fix

hakanardo noreply at buildbot.pypy.org
Sun Nov 6 10:49:59 CET 2011


Author: Hakan Ardo <hakan at debian.org>
Branch: jit-targets
Changeset: r48816:0faba264d761
Date: 2011-11-06 10:49 +0100
http://bitbucket.org/pypy/pypy/changeset/0faba264d761/

Log:	fix

diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -77,8 +77,7 @@
             # test_memgr.py)
             if descr.procedure_token is not looptoken:
                 looptoken.record_jump_to(descr.procedure_token)
-            # FIXME: Why? How is the jump supposed to work without a target??
-            #op._descr = None    # clear reference, mostly for tests
+            op._descr = None    # clear reference, mostly for tests
             if not we_are_translated():
                 op._jumptarget_number = descr.procedure_token.number
     # record this looptoken on the QuasiImmut used in the code
@@ -649,10 +648,11 @@
         return None
     # We managed to create a bridge.  Dispatch to resumekey to
     # know exactly what we must do (ResumeGuardDescr/ResumeFromInterpDescr)
+    target_token = new_loop.operations[-1].getdescr()
     resumekey.compile_and_attach(metainterp, new_loop)
     record_loop_or_bridge(metainterp_sd, new_loop)
 
-    return new_loop.operations[-1].getdescr()
+    return target_token
 
 # ____________________________________________________________
 


More information about the pypy-commit mailing list