[pypy-svn] r64658 - pypy/branch/pyjitpl5/pypy/jit/metainterp

fijal at codespeak.net fijal at codespeak.net
Fri Apr 24 21:25:47 CEST 2009


Author: fijal
Date: Fri Apr 24 21:25:47 2009
New Revision: 64658

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/compile.py
Log:
attempt at making assertions pass, some tests fail thanks to different
counts, let's see..


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/compile.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/compile.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/compile.py	Fri Apr 24 21:25:47 2009
@@ -106,8 +106,10 @@
     history.source_link = loop
     send_loop_to_backend(metainterp, loop, "loop")
     metainterp.staticdata.stats.loops.append(loop)
-    if loop not in map_loop2descr:
-        old_loops.append(loop)
+    if len(old_loops) != 0:
+        import pdb
+        pdb.set_trace()
+    old_loops.append(loop)
     return loop
 
 def send_loop_to_backend(metainterp, loop, type):
@@ -244,10 +246,7 @@
         # 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, [])
-        if new_loop not in map_loop2descr:
-            old_loops.append(new_loop)
-
+        glob.compiled_merge_points[greenkey] = [new_loop]
 
 def compile_fresh_bridge(metainterp, old_loops, resumekey):
     # The history contains new operations to attach as the code for the



More information about the Pypy-commit mailing list