From a4dd46a47fe1d4fe1f1738c2f5b3712de41056b9 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 30 May 2018 22:31:21 -0700 Subject: [PATCH] bpo-33677: Fix signatures of tp_clear handlers for AST and deque. (GH-7196) (cherry picked from commit a5c42284e69fb309bdd17ee8c1c120d1be383012) Co-authored-by: Serhiy Storchaka --- Modules/_collectionsmodule.c | 7 ++++--- Parser/asdl_c.py | 3 ++- Python/Python-ast.c | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 5753dd946a..4116d40535 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -575,7 +575,7 @@ deque_concat(dequeobject *deque, PyObject *other) return new_deque; } -static void +static int deque_clear(dequeobject *deque) { block *b; @@ -587,7 +587,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 @@ -648,7 +648,7 @@ deque_clear(dequeobject *deque) } CHECK_END(leftblock->rightlink); freeblock(leftblock); - return; + return 0; alternate_method: while (Py_SIZE(deque)) { @@ -656,6 +656,7 @@ deque_clear(dequeobject *deque) assert (item != NULL); Py_DECREF(item); } + return 0; } static PyObject * diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 399e79e059..44e3d40c61 100644 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -647,10 +647,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 diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 38b9292577..6a2f28e0e7 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -528,10 +528,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 -- 2.40.0