[pypy-commit] pypy jit-improve-nested-loops: we cant call get_procedure_token if we are in_recursion since the actual greenkey arguments are wrongly typed for the "main" jitdriver of the metainterp

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-improve-nested-loops
Changeset: r50822:ce62dce925d3
Date: 2011-12-22 16:02 +0100
http://bitbucket.org/pypy/pypy/changeset/ce62dce925d3/

Log:	we cant call get_procedure_token if we are in_recursion since the
	actual greenkey arguments are wrongly typed for the "main" jitdriver
	of the metainterp

diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -980,7 +980,7 @@
         if self.metainterp.seen_loop_header_for_jdindex < 0:
             if not any_operation:
                 return
-            if not self.metainterp.get_procedure_token(greenboxes, True):
+            if self.metainterp.in_recursion or not self.metainterp.get_procedure_token(greenboxes, True):
                 if not jitdriver_sd.no_loop_header:
                     return
             # automatically add a loop_header if there is none