[pypy-svn] r63931 - pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Fri Apr 10 11:33:55 2009
New Revision: 63931

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/compile.py
Log:
Fix(?) for fijal: trying to make sure that if we have a
non-optimizing version of metainterp, prepare_loop_from_bridge()
is never actually called.


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/compile.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/compile.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/compile.py	Fri Apr 10 11:33:55 2009
@@ -237,6 +237,11 @@
         # send the new_loop to warmspot.py, to be called directly the next time
         metainterp_sd.state.attach_unoptimized_bridge_from_interp(greenkey,
                                                                   new_loop)
+        # store the new_loop in compiled_merge_points too
+        # XXX it's probably useless to do so when optimizing
+        glob = metainterp_sd.globaldata
+        old_loops = glob.compiled_merge_points.setdefault(greenkey, [])
+        old_loops.append(new_loop)
 
 
 def compile_fresh_bridge(metainterp, old_loops, resumekey):