Stackless issue #137: Add Stackless support to "call" functions

- Add Stackless support to _PyObject_FastCallKeywords().
- Use STACKLESS_PROPOSE_... in a consistent way.

Author: Anselm Kruis

Objects/abstract.c

@@ -2441,6 +2441,7 @@ PyObject *
 _PyObject_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs,
                            PyObject *kwnames)
 {
+    STACKLESS_GETARG();
     PyObject *kwdict, *result;
     Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
 
@@ -2450,7 +2451,10 @@ _PyObject_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs,
 
     if (PyFunction_Check(func)) {
         /* Fast-path: avoid temporary tuple or dict */
-        return _PyFunction_FastCallKeywords(func, stack, nargs, kwnames);
+        STACKLESS_PROMOTE_ALL();
+        result = _PyFunction_FastCallKeywords(func, stack, nargs, kwnames);
+        STACKLESS_ASSERT();
+        return result;
     }
 
     if (nkwargs > 0) {
@@ -2463,7 +2467,9 @@ _PyObject_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs,
         kwdict = NULL;
     }
 
+    STACKLESS_PROMOTE_ALL();
     result = _PyObject_FastCallDict(func, stack, nargs, kwdict);
+    STACKLESS_ASSERT();
     Py_XDECREF(kwdict);
     return result;
 }

Python/ceval.c

@@ -3659,9 +3659,11 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             assert(PyTuple_CheckExact(callargs));
             func = TOP();
 
+            STACKLESS_PROPOSE_ALL();
             READ_TIMESTAMP(intr0);
             result = do_call_core(func, callargs, kwargs);
             READ_TIMESTAMP(intr1);
+            STACKLESS_ASSERT();
             Py_DECREF(func);
             Py_DECREF(callargs);
             Py_XDECREF(kwargs);
@@ -5526,16 +5528,16 @@ call_function(PyObject ***pp_stack, Py_ssize_t oparg, PyObject *kwnames
 
       stack = (*pp_stack) - nargs - nkwargs;
 
+      STACKLESS_PROPOSE_ALL();
       READ_TIMESTAMP(*pintr0);
       if (PyFunction_Check(func)) {
-          STACKLESS_PROPOSE_ALL();
           x = fast_function(func, stack, nargs, kwnames);
-          STACKLESS_ASSERT();
       }
       else {
           x = _PyObject_FastCallKeywords(func, stack, nargs, kwnames);
       }
       READ_TIMESTAMP(*pintr1);
+      STACKLESS_ASSERT();
 
       Py_DECREF(func);
     }
@@ -5851,7 +5853,6 @@ do_call_core(PyObject *func, PyObject *callargs, PyObject *kwdict)
         PCALL(PCALL_OTHER);
 #endif
 
-    STACKLESS_PROPOSE_ALL();
     if (PyCFunction_Check(func)) {
         PyThreadState *tstate = PyThreadState_GET();
         C_TRACE(result, PyCFunction_Call(func, callargs, kwdict));
@@ -5860,7 +5861,6 @@ do_call_core(PyObject *func, PyObject *callargs, PyObject *kwdict)
     else {
         result = PyObject_Call(func, callargs, kwdict);
     }
-    STACKLESS_ASSERT();
 
     return result;
 }