merge 3.4-slp (Stackless python#70)

Anselm Kruis · Anselm Kruis · commit 734a42ac7042 · 2016-11-09T23:54:11.000+01:00
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2104,14 +2104,14 @@ PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw)
 #endif
         Py_LeaveRecursiveCall();
 #ifdef NDEBUG
-        if (result == NULL && !PyErr_Occurred()) {
+        if (STACKLESS_RETVAL(result) == NULL && !PyErr_Occurred()) {
             PyErr_SetString(
                 PyExc_SystemError,
                 "NULL result without error in PyObject_Call");
         }
 #else
-        assert((result != NULL && !PyErr_Occurred())
-                || (result == NULL && PyErr_Occurred()));
+        assert((STACKLESS_RETVAL(result) != NULL && !PyErr_Occurred())
+                || (STACKLESS_RETVAL(result) == NULL && PyErr_Occurred()));
 #endif
         return result;
     }
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -3862,13 +3862,8 @@ PyEval_EvalFrame_value(PyFrameObject *f, int throwflag, PyObject *retval)
     if (why != WHY_RETURN)
         retval = NULL;
 
-#ifdef STACKLESS
     assert((STACKLESS_RETVAL(retval) != NULL && !PyErr_Occurred())
             || (STACKLESS_RETVAL(retval) == NULL && PyErr_Occurred()));
-#else
-    assert((retval != NULL && !PyErr_Occurred())
-            || (retval == NULL && PyErr_Occurred()));
-#endif
 
 fast_yield:
     if (co->co_flags & CO_GENERATOR) {
@@ -4936,13 +4931,8 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *arg, PyObject *kw)
     STACKLESS_ASSERT();
     Py_DECREF(arg);
 
-#ifdef STACKLESS
     assert((STACKLESS_RETVAL(result) != NULL && !PyErr_Occurred())
            || (STACKLESS_RETVAL(result) == NULL && PyErr_Occurred()));
-#else
-    assert((result != NULL && !PyErr_Occurred())
-           || (result == NULL && PyErr_Occurred()));
-#endif
     return result;
 }
 
@@ -5097,13 +5087,8 @@ call_function(PyObject ***pp_stack, int oparg
         READ_TIMESTAMP(*pintr1);
         Py_DECREF(func);
     }
-#ifdef STACKLESS
     assert((STACKLESS_RETVAL(x) != NULL && !PyErr_Occurred())
            || (STACKLESS_RETVAL(x) == NULL && PyErr_Occurred()));
-#else
-    assert((x != NULL && !PyErr_Occurred())
-           || (x == NULL && PyErr_Occurred()));
-#endif
 
     /* Clear the stack of the function object.  Also removes
        the arguments in case they weren't consumed already
@@ -5115,13 +5100,8 @@ call_function(PyObject ***pp_stack, int oparg
         PCALL(PCALL_POP);
     }
 
-#ifdef STACKLESS
     assert((STACKLESS_RETVAL(x) != NULL && !PyErr_Occurred())
            || (STACKLESS_RETVAL(x) == NULL && PyErr_Occurred()));
-#else
-    assert((x != NULL && !PyErr_Occurred())
-           || (x == NULL && PyErr_Occurred()));
-#endif
     return x;
 }
 
@@ -5424,13 +5404,8 @@ ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk)
     Py_XDECREF(callargs);
     Py_XDECREF(kwdict);
     Py_XDECREF(stararg);
-#ifdef STACKLESS
     assert((STACKLESS_RETVAL(result) != NULL && !PyErr_Occurred())
            || (STACKLESS_RETVAL(result) == NULL && PyErr_Occurred()));
-#else
-    assert((result != NULL && !PyErr_Occurred())
-           || (result == NULL && PyErr_Occurred()));
-#endif
     return result;
 }
 
diff --git a/Stackless/changelog.txt b/Stackless/changelog.txt
@@ -245,18 +245,6 @@ What's New in Stackless 3.3.5?
 - http://www.stackless.com/ticket/23: Fix compile error with STACKLESS_OFF
   defined
 
-<<<<<<< local
-=======
-
-What's New in Stackless 2.7.4rc2?
-=================================
-
-*Release date: 2013-05-01*
-
-(A selection of user visible changes from mercurial commit log messages. Use
- "hg log -b 2.7-slp -r v2.7.4rc2-slp:v2.7.2-slp  -v -M" to get the complete log.)
-
->>>>>>> other
 - http://www.stackless.com/ticket/21: Fix crash on exit.
 
 - http://www.stackless.com/ticket/22: soft switching for context managers.
@@ -359,11 +347,7 @@ The very beginning of Stackless
 			Especially, the frame dispatcher idea will be revived.
 			It turns out to make sense:
 			Try to let the innermost interpreter resolve some recusrions.
-<<<<<<< local
-			Find an equivalent of olde Py_UnwindToken. Probably the
-=======
 			Find an equivalent of old Py_UnwindToken. Probably the
->>>>>>> other
 			protocol of the new generators can be extended.
 			Now I *do* think to modify frames. They get an additional
 			field for their C stack part.
diff --git a/Stackless/core/stackless_impl.h b/Stackless/core/stackless_impl.h
@@ -554,6 +554,8 @@ PyObject * slp_get_channel_callback(void);
 #define STACKLESS_RETRACT() assert(1)
 #define STACKLESS_ASSERT() assert(1)
 
+#define STACKLESS_RETVAL(obj) (obj)
+
 #define STACKLESS_DECLARE_METHOD(type, meth)
 
 #endif /* STACKLESS */
