[pypy-svn] r76424 - pypy/trunk/pypy/objspace/std

[agaynor at codespeak.net]

Author: agaynor
Date: Sun Aug  1 15:52:40 2010
New Revision: 76424

Modified:
   pypy/trunk/pypy/objspace/std/callmethod.py
Log:
Another attempt to fix stackless.

Modified: pypy/trunk/pypy/objspace/std/callmethod.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/callmethod.py	(original)
+++ pypy/trunk/pypy/objspace/std/callmethod.py	Sun Aug  1 15:52:40 2010
@@ -68,7 +68,7 @@
     if not n_kwargs:
         try:
             w_result = f.space.call_valuestack(w_callable, n, f)
-            rstack.resume_point("CALL_METHOD", f, n_args, returns=w_result)
+            rstack.resume_point("CALL_METHOD_no_kwargs", f, n_args, returns=w_result)
         finally:
             f.dropvalues(n_args + 2)
     else:
@@ -89,7 +89,7 @@
         
         try:
             w_result = f.space.call_args(w_callable, args)
-            rstack.resume_point("CALL_METHOD", f, returns=w_result)
+            rstack.resume_point("CALL_METHOD", f, w_self, returns=w_result)
         finally:
             f.dropvalues(1 + (w_self is None))
     f.pushvalue(w_result)