bpo-33677: Fix signatures of tp_clear handlers for AST and deque. (GH-7196) (GH-7269)

miss-islington · serhiy-storchaka · serhiy-storchaka · commit 0fe3be03926c · 2018-05-31T09:10:28.000+03:00
(cherry picked from commit a5c4228) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
@@ -574,7 +574,7 @@ deque_concat(dequeobject *deque, PyObject *other)
     return new_deque;
 }
 
-static void
+static int
 deque_clear(dequeobject *deque)
 {
     block *b;
@@ -586,7 +586,7 @@ deque_clear(dequeobject *deque)
     PyObject **itemptr, **limit;
 
     if (Py_SIZE(deque) == 0)
-        return;
+        return 0;
 
     /* During the process of clearing a deque, decrefs can cause the
        deque to mutate.  To avoid fatal confusion, we have to make the
@@ -647,14 +647,15 @@ deque_clear(dequeobject *deque)
     }
     CHECK_END(leftblock->rightlink);
     freeblock(leftblock);
-    return;
+    return 0;
 
   alternate_method:
     while (Py_SIZE(deque)) {
         item = deque_pop(deque, NULL);
         assert (item != NULL);
         Py_DECREF(item);
     }
+    return 0;
 }
 
 static PyObject *
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -643,10 +643,11 @@ def visitModule(self, mod):
     return 0;
 }
 
-static void
+static int
 ast_clear(AST_object *self)
 {
     Py_CLEAR(self->dict);
+    return 0;
 }
 
 static int
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
@@ -525,10 +525,11 @@ ast_traverse(AST_object *self, visitproc visit, void *arg)
     return 0;
 }
 
-static void
+static int
 ast_clear(AST_object *self)
 {
     Py_CLEAR(self->dict);
+    return 0;
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ deque_concat(dequeobject deque, PyObject other)`
`574`	`574`	`return new_deque;`
`575`	`575`	`}`
`576`	`576`
`577`		`-static void`
	`577`	`+static int`
`578`	`578`	`deque_clear(dequeobject *deque)`
`579`	`579`	`{`
`580`	`580`	`block *b;`
`@@ -586,7 +586,7 @@ deque_clear(dequeobject *deque)`
`586`	`586`	`PyObject itemptr, limit;`
`587`	`587`
`588`	`588`	`if (Py_SIZE(deque) == 0)`
`589`		`- return;`
	`589`	`+ return 0;`
`590`	`590`
`591`	`591`	`/* During the process of clearing a deque, decrefs can cause the`
`592`	`592`	`deque to mutate. To avoid fatal confusion, we have to make the`
`@@ -647,14 +647,15 @@ deque_clear(dequeobject *deque)`
`647`	`647`	`}`
`648`	`648`	`CHECK_END(leftblock->rightlink);`
`649`	`649`	`freeblock(leftblock);`
`650`		`- return;`
	`650`	`+ return 0;`
`651`	`651`
`652`	`652`	`alternate_method:`
`653`	`653`	`while (Py_SIZE(deque)) {`
`654`	`654`	`item = deque_pop(deque, NULL);`
`655`	`655`	`assert (item != NULL);`
`656`	`656`	`Py_DECREF(item);`
`657`	`657`	`}`
	`658`	`+ return 0;`
`658`	`659`	`}`
`659`	`660`
`660`	`661`	`static PyObject *`
Original file line number	Diff line number	Diff line change
`@@ -525,10 +525,11 @@ ast_traverse(AST_object self, visitproc visit, void arg)`
`525`	`525`	`return 0;`
`526`	`526`	`}`
`527`	`527`
`528`		`-static void`
	`528`	`+static int`
`529`	`529`	`ast_clear(AST_object *self)`
`530`	`530`	`{`
`531`	`531`	`Py_CLEAR(self->dict);`
	`532`	`+ return 0;`
`532`	`533`	`}`
`533`	`534`
`534`	`535`	`static int`