[pypy-svn] r40956 - pypy/dist/pypy/interpreter

[ac at codespeak.net]

Author: ac
Date: Wed Mar 21 17:32:11 2007
New Revision: 40956

Modified:
   pypy/dist/pypy/interpreter/callmethod.py
Log:
Have CALL_METHOD not use call_valuestack in the jitted case.


Modified: pypy/dist/pypy/interpreter/callmethod.py
==============================================================================
--- pypy/dist/pypy/interpreter/callmethod.py	(original)
+++ pypy/dist/pypy/interpreter/callmethod.py	Wed Mar 21 17:32:11 2007
@@ -11,6 +11,8 @@
 """
 
 from pypy.interpreter import pyframe, function
+from pypy.rlib.objectmodel import we_are_jitted
+from pypy.interpreter.argument import Arguments
 
 
 def object_getattribute(space):
@@ -58,11 +60,20 @@
 
     def CALL_METHOD(f, nargs, *ignored):
         # 'nargs' is the argument count excluding the implicit 'self'
-        w_self     = f.peekvalue(nargs)
-        w_callable = f.peekvalue(nargs + 1)
-        try:
+        w_self = f.peekvalue(nargs)
+        if we_are_jitted():
+            if w_self is None:
+                args = f.popvalues(nargs)
+                f.popvalue() # w_self
+            else:
+                args = f.popvalues(nargs + 1)
+            w_callable = f.popvalue()
+            w_result = f.space.call_args(w_callable, Arguments(f.space, args))
+        else:
+            w_callable = f.peekvalue(nargs + 1)
             n = nargs + (w_self is not None)
-            w_result = f.space.call_valuestack(w_callable, n, f)
-        finally:
-            f.dropvalues(nargs + 2)
+            try:
+                w_result = f.space.call_valuestack(w_callable, n, f)
+            finally:
+                f.dropvalues(nargs + 2)
         f.pushvalue(w_result)