Author: Armin Rigo <[email protected]>
Branch: 
Changeset: r66035:575f1677ec89
Date: 2013-08-09 11:29 +0200
http://bitbucket.org/pypy/pypy/changeset/575f1677ec89/

Log:    Use a call_location specialization. Might really fix krono's issue.

diff --git a/rpython/annotator/specialize.py b/rpython/annotator/specialize.py
--- a/rpython/annotator/specialize.py
+++ b/rpython/annotator/specialize.py
@@ -379,4 +379,4 @@
 
 def specialize_call_location(funcdesc, args_s, op):
     assert op is not None
-    return maybe_star_args(funcdesc, op, args_s)
+    return maybe_star_args(funcdesc, (op,), args_s)
diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py
--- a/rpython/rlib/jit.py
+++ b/rpython/rlib/jit.py
@@ -996,14 +996,14 @@
 def _jit_conditional_call(condition, function, *args):
     pass
 
[email protected]_and_arg(1)
[email protected]_location()
 def conditional_call(condition, function, *args):
     if we_are_jitted():
         _jit_conditional_call(condition, function, *args)
     else:
         if condition:
             function(*args)
-conditional_call._annenforceargs_ = [bool, None, None]
+conditional_call._always_inline_ = True
 
 class ConditionalCallEntry(ExtRegistryEntry):
     _about_ = _jit_conditional_call
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to