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

[fijal at codespeak.net]

Author: fijal
Date: Wed Aug  4 14:12:45 2010
New Revision: 76467

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	Wed Aug  4 14:12:45 2010
@@ -68,8 +68,6 @@
     if not n_kwargs:
         try:
             w_result = f.space.call_valuestack(w_callable, n, f)
-            rstack.resume_point("CALL_METHOD", f, w_self, n_args,
-                                returns=w_result)
         finally:
             f.dropvalues(n_args + 2)
     else:
@@ -90,10 +88,9 @@
         
         try:
             w_result = f.space.call_args(w_callable, args)
-            rstack.resume_point("CALL_METHOD", f, w_self, n_args,
-                                returns=w_result)
         finally:
             f.dropvalues(1 + (w_self is None))
+    rstack.resume_point("CALL_METHOD", f, returns=w_result)
     f.pushvalue(w_result)