Stackless issue python#140: Fix compiler warnings

Anselm Kruis · Anselm Kruis · commit 3461ccf90d3e · 2017-10-29T20:46:46.000+01:00
- Initialize variable 'len' in function unwrap_frame_arg(). - Assign to '*valid' in function slp_find_execname(). - Disable GCC warning -Waddress in macro TASKLET_SETVAL(task, val). - Update Stackless/changelog.txt for issues python#138, python#140
diff --git a/Stackless/changelog.txt b/Stackless/changelog.txt
@@ -9,6 +9,12 @@ What's New in Stackless 3.X.X?
 
 *Release date: 20XX-XX-XX*
 
+- https://github.com/stackless-dev/stackless/issues/140
+  Fix bugs in prickelpit.c unwrap_frame_arg() and slp_find_execname().
+
+- https://github.com/stackless-dev/stackless/issues/138
+  Correctly propose Stackless calls for C-functions.
+
 - https://bitbucket.org/stackless-dev/stackless/issues/129
   C-API: Calling PyTasklet_New( NULL, ...) no longer crashes.
 
diff --git a/Stackless/core/stackless_impl.h b/Stackless/core/stackless_impl.h
@@ -679,11 +679,23 @@ do { \
 } while(0)
 
 /* ditto, without incref. Made no sense to optimize. */
+#if defined(__GNUC__) && defined(__STDC__) && (__STDC_VERSION__ >= 199901L)
+#define SLP_DISABLE_GCC_W_ADDRESS \
+	    _Pragma("GCC diagnostic push") \
+	    _Pragma("GCC diagnostic ignored \"-Waddress\"")
+#define SLP_RESTORE_WARNINGS \
+	    _Pragma("GCC diagnostic pop")
+#else
+#define SLP_DISABLE_GCC_W_ADDRESS /**/
+#define SLP_RESTORE_WARNINGS /**/
+#endif
 
 #define TASKLET_SETVAL_OWN(task, val) \
 do { \
     PyObject *hold = (task)->tempval; \
+    SLP_DISABLE_GCC_W_ADDRESS /* suppress warning, if val == Py_NONE */ \
     assert(val != NULL); \
+    SLP_RESTORE_WARNINGS \
     (task)->tempval = (PyObject *) val; \
     Py_DECREF(hold); \
 } while(0)
diff --git a/Stackless/pickling/prickelpit.c b/Stackless/pickling/prickelpit.c
@@ -236,7 +236,11 @@ unwrap_frame_arg(PyObject * args) {
     int is_instance;
     Py_ssize_t len, i;
 
-    if (!PyTuple_Check(args) || (len = PyTuple_Size(args)) < 1) {
+    if (!PyTuple_Check(args)) {
+        Py_INCREF(args);
+        return args;
+    }
+    if ((len = PyTuple_Size(args)) < 1) {
         if (len < 0)
             return NULL;
         Py_INCREF(args);
@@ -500,6 +504,8 @@ slp_find_execname(PyFrameObject *f, int *valid)
     PyObject *dic = dp ? dp->dict : NULL;
     PyObject *exec_addr = PyLong_FromVoidPtr(f->f_execute);
 
+    assert(valid != NULL);
+
     if (exec_addr == NULL) return NULL;
     exec_name = dic ? PyDict_GetItem(dic, exec_addr) : NULL;
     if (exec_name == NULL) {
@@ -508,7 +514,7 @@ slp_find_execname(PyFrameObject *f, int *valid)
         sprintf(msg, "frame exec function at %lx is not registered!",
             (unsigned long)(void *)f->f_execute);
         PyErr_SetString(PyExc_ValueError, msg);
-        valid = 0;
+        *valid = 0;
     }
     else {
         PyFrame_ExecFunc *good, *bad;
@@ -517,7 +523,7 @@ slp_find_execname(PyFrameObject *f, int *valid)
             goto err_exit;
         }
         if (f->f_execute == bad)
-            valid = 0;
+            *valid = 0;
         else if (f->f_execute != good) {
             PyErr_SetString(PyExc_SystemError,
                 "inconsistent c?frame function registration");
