[pypy-commit] pypy memoryerror2: start from the other way arround and apply changes until it does not work anymore

[plan_rich]

Author: Richard Plangger <rich at pasra.at>
Branch: memoryerror2
Changeset: r79185:0e7fdd3779b2
Date: 2015-08-24 11:05 +0200
http://bitbucket.org/pypy/pypy/changeset/0e7fdd3779b2/

Log:	start from the other way arround and apply changes until it does not
	work anymore

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -199,10 +199,11 @@
             vl.inputargs = version.inputargs
             vl.operations = version.operations
             vl.original_jitcell_token = jitcell_token
-            send_bridge_to_backend(jitdriver_sd, metainterp_sd,
+            asminfo = send_bridge_to_backend(jitdriver_sd, metainterp_sd,
                                    faildescr, version.inputargs,
                                    version.operations, jitcell_token)
             record_loop_or_bridge(metainterp_sd, vl)
+            version.compiled = asminfo
             for faildescr in version.faildescrs[1:]:
                 cpu.stitch_bridge(faildescr, jitcell_token)
     loop.versions = None
@@ -436,6 +437,7 @@
     #if metainterp_sd.warmrunnerdesc is not None:    # for tests
     #    metainterp_sd.warmrunnerdesc.memory_manager.keep_loop_alive(
     #        original_loop_token)
+    return asminfo
 
 # ____________________________________________________________
 
diff --git a/rpython/jit/metainterp/optimizeopt/vectorize.py b/rpython/jit/metainterp/optimizeopt/vectorize.py
--- a/rpython/jit/metainterp/optimizeopt/vectorize.py
+++ b/rpython/jit/metainterp/optimizeopt/vectorize.py
@@ -52,7 +52,7 @@
         gso = GuardStrengthenOpt(opt.dependency_graph.index_vars)
         gso.propagate_all_forward(opt.loop, user_code)
         # connect all compile loop version fail descriptors to this version
-        version.register_all_guards(loop.operations, opt.appended_arg_count)
+        #version.register_all_guards(loop.operations, opt.appended_arg_count)
         #
         #
         end = time.clock()