Issue #28544: Pass PyObject* to _PyDict_Pop, not PyDictObject*

1st1 · 1st1 · commit 684ef2c88882 · 2016-10-28T19:01:21.000-04:00
diff --git a/Include/dictobject.h b/Include/dictobject.h
@@ -112,7 +112,7 @@ PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
 PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
 Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys);
 Py_ssize_t _PyDict_SizeOf(PyDictObject *);
-PyAPI_FUNC(PyObject *) _PyDict_Pop(PyDictObject *, PyObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyDict_Pop(PyObject *, PyObject *, PyObject *);
 PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
 #define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
 
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
@@ -21,7 +21,7 @@ _Py_IDENTIFIER(_wakeup);
 
 /* State of the _asyncio module */
 static PyObject *all_tasks;
-static PyDictObject *current_tasks;
+static PyObject *current_tasks;
 static PyObject *traceback_extract_stack;
 static PyObject *asyncio_get_event_loop;
 static PyObject *asyncio_future_repr_info_func;
@@ -1429,11 +1429,11 @@ _asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop)
             return NULL;
         }
 
-        res = PyDict_GetItem((PyObject*)current_tasks, loop);
+        res = PyDict_GetItem(current_tasks, loop);
         Py_DECREF(loop);
     }
     else {
-        res = PyDict_GetItem((PyObject*)current_tasks, loop);
+        res = PyDict_GetItem(current_tasks, loop);
     }
 
     if (res == NULL) {
@@ -2235,7 +2235,7 @@ task_step(TaskObj *task, PyObject *exc)
     PyObject *res;
     PyObject *ot;
 
-    if (PyDict_SetItem((PyObject *)current_tasks,
+    if (PyDict_SetItem(current_tasks,
                        task->task_loop, (PyObject*)task) == -1)
     {
         return NULL;
@@ -2385,7 +2385,7 @@ module_init(void)
         goto fail;
     }
 
-    current_tasks = (PyDictObject *)PyDict_New();
+    current_tasks = PyDict_New();
     if (current_tasks == NULL) {
         goto fail;
     }
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -1768,13 +1768,17 @@ PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue)
 
 /* Internal version of dict.pop(). */
 PyObject *
-_PyDict_Pop(PyDictObject *mp, PyObject *key, PyObject *deflt)
+_PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt)
 {
     Py_hash_t hash;
     Py_ssize_t ix, hashpos;
     PyObject *old_value, *old_key;
     PyDictKeyEntry *ep;
     PyObject **value_addr;
+    PyDictObject *mp;
+
+    assert(PyDict_Check(dict));
+    mp = (PyDictObject *)dict;
 
     if (mp->ma_used == 0) {
         if (deflt) {
@@ -2836,7 +2840,7 @@ dict_pop(PyDictObject *mp, PyObject *args)
     if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt))
         return NULL;
 
-    return _PyDict_Pop(mp, key, deflt);
+    return _PyDict_Pop((PyObject*)mp, key, deflt);
 }
 
 static PyObject *

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ _Py_IDENTIFIER(_wakeup);`
`21`	`21`
`22`	`22`	`/* State of the _asyncio module */`
`23`	`23`	`static PyObject *all_tasks;`
`24`		`-static PyDictObject *current_tasks;`
	`24`	`+static PyObject *current_tasks;`
`25`	`25`	`static PyObject *traceback_extract_stack;`
`26`	`26`	`static PyObject *asyncio_get_event_loop;`
`27`	`27`	`static PyObject *asyncio_future_repr_info_func;`
`@@ -1429,11 +1429,11 @@ _asyncio_Task_current_task_impl(PyTypeObject type, PyObject loop)`
`1429`	`1429`	`return NULL;`
`1430`	`1430`	`}`
`1431`	`1431`
`1432`		`- res = PyDict_GetItem((PyObject*)current_tasks, loop);`
	`1432`	`+ res = PyDict_GetItem(current_tasks, loop);`
`1433`	`1433`	`Py_DECREF(loop);`
`1434`	`1434`	`}`
`1435`	`1435`	`else {`
`1436`		`- res = PyDict_GetItem((PyObject*)current_tasks, loop);`
	`1436`	`+ res = PyDict_GetItem(current_tasks, loop);`
`1437`	`1437`	`}`
`1438`	`1438`
`1439`	`1439`	`if (res == NULL) {`
`@@ -2235,7 +2235,7 @@ task_step(TaskObj task, PyObject exc)`
`2235`	`2235`	`PyObject *res;`
`2236`	`2236`	`PyObject *ot;`
`2237`	`2237`
`2238`		`- if (PyDict_SetItem((PyObject *)current_tasks,`
	`2238`	`+ if (PyDict_SetItem(current_tasks,`
`2239`	`2239`	`task->task_loop, (PyObject*)task) == -1)`
`2240`	`2240`	`{`
`2241`	`2241`	`return NULL;`
`@@ -2385,7 +2385,7 @@ module_init(void)`
`2385`	`2385`	`goto fail;`
`2386`	`2386`	`}`
`2387`	`2387`
`2388`		`- current_tasks = (PyDictObject *)PyDict_New();`
	`2388`	`+ current_tasks = PyDict_New();`
`2389`	`2389`	`if (current_tasks == NULL) {`
`2390`	`2390`	`goto fail;`
`2391`	`2391`	`}`