Stackless issue python#140: Fix compiler warnings

Anselm Kruis · Anselm Kruis · commit 2b68ad318be6 · 2017-11-05T19:15:30.000+01:00
- fix a warning about an unused expression result in ceval.c
- fix a warning about a non literal NULL-pointer initialization in
prickelpit.c
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -3621,7 +3621,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
 #ifdef STACKLESS
             if (STACKLESS_UNWINDING(result)) {
                 retval = result;
-                POP();  /* compensate for the PUSH(res) after label stackless_call_return: */
+                (void) POP();  /* compensate for the PUSH(res) after label stackless_call_return: */
                 goto stackless_call;
             }
 #endif
diff --git a/Stackless/pickling/prickelpit.c b/Stackless/pickling/prickelpit.c
@@ -1702,16 +1702,20 @@ static int init_methodwrappertype(void)
 static PyTypeObject wrap_PyGen_Type;
 static PyTypeObject wrap_PyCoro_Type;
 
-/* Used to initialize a generator created by gen_new. 
-   Also assert, that the size of generator and coroutines is equal. */
-static PyFrameObject *gen_exhausted_frame = \
-Py_BUILD_ASSERT_EXPR(sizeof(PyGenObject) == sizeof(PyCoroObject)); /* value is 0 */
+/* Used to initialize a generator created by gen_new. */
+static PyFrameObject *gen_exhausted_frame = NULL;
 
+/* The usual reduce method.
+ * Also assert at compile time, that the size of generator and coroutines is
+ * equal.
+ */
 static PyObject *
 _gen_reduce(PyTypeObject *type, PyGenObject *gen)
 {
     PyObject *tup;
     PyObject *frame_reducer = (PyObject *)gen->gi_frame;
+    Py_BUILD_ASSERT(sizeof(PyGenObject) == sizeof(PyCoroObject));
+
     if (frame_reducer == NULL) {
         /* Pickle NULL as None. See gen_setstate() for the corresponding
          * unpickling code. */

Original file line number	Diff line number	Diff line change
`@@ -3621,7 +3621,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)`
`3621`	`3621`	`#ifdef STACKLESS`
`3622`	`3622`	`if (STACKLESS_UNWINDING(result)) {`
`3623`	`3623`	`retval = result;`
`3624`		`- POP(); /* compensate for the PUSH(res) after label stackless_call_return: */`
	`3624`	`+ (void) POP(); /* compensate for the PUSH(res) after label stackless_call_return: */`
`3625`	`3625`	`goto stackless_call;`
`3626`	`3626`	`}`
`3627`	`3627`	`#endif`