[pypy-svn] r79979 - pypy/branch/jit-unroll-loops/pypy/jit/metainterp

[hakanardo at codespeak.net]

Author: hakanardo
Date: Sat Dec 11 15:48:09 2010
New Revision: 79979

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/compile.py
Log:
started to sort out merge failures

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/compile.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/compile.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/compile.py	Sat Dec 11 15:48:09 2010
@@ -112,16 +112,17 @@
         if full_preamble_needed or not loop.preamble.token.short_preamble:
             send_loop_to_backend(metainterp_sd, loop.preamble, "entry bridge")
             insert_loop_token(old_loop_tokens, loop.preamble.token)
-            record_loop_or_bridge(loop.preamble)
             jitdriver_sd.warmstate.attach_unoptimized_bridge_from_interp(
                 greenkey, loop.preamble.token)
-        return loop.preamble.token
+            token = loop.preamble.token
+            record_loop_or_bridge(loop.preamble)
+        return token
     else:
         send_loop_to_backend(metainterp_sd, loop, "loop")
         insert_loop_token(old_loop_tokens, loop_token)
-        record_loop_or_bridge(loop)
         jitdriver_sd.warmstate.attach_unoptimized_bridge_from_interp(
             greenkey, loop.token)
+        record_loop_or_bridge(loop)
         return loop_token
 
 def insert_loop_token(old_loop_tokens, loop_token):