From: Victor Stinner <vstinner@python.org>
Date: Sat, 4 Jul 2020 21:18:15 +0000 (+0200)
Subject: bpo-41204: Fix compiler warning in ast_type_init() (GH-21307)
X-Git-Tag: v3.10.0a1~448
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f76453173267887ed05bb3783e862cb22365ae8;p=thirdparty%2FPython%2Fcpython.git

bpo-41204: Fix compiler warning in ast_type_init() (GH-21307)
---

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index b93906ba8d45..6fe44b99f793 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -688,13 +688,14 @@ ast_clear(AST_object *self)
 static int
 ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
 {
-    Py_ssize_t i, numfields = 0;
-    int res = -1;
-    PyObject *key, *value, *fields;
     astmodulestate *state = get_global_ast_state();
     if (state == NULL) {
-        goto cleanup;
+        return -1;
     }
+
+    Py_ssize_t i, numfields = 0;
+    int res = -1;
+    PyObject *key, *value, *fields;
     if (_PyObject_LookupAttr((PyObject*)Py_TYPE(self), state->_fields, &fields) < 0) {
         goto cleanup;
     }
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index b81b282a0396..396a6832702b 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -1140,13 +1140,14 @@ ast_clear(AST_object *self)
 static int
 ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
 {
-    Py_ssize_t i, numfields = 0;
-    int res = -1;
-    PyObject *key, *value, *fields;
     astmodulestate *state = get_global_ast_state();
     if (state == NULL) {
-        goto cleanup;
+        return -1;
     }
+
+    Py_ssize_t i, numfields = 0;
+    int res = -1;
+    PyObject *key, *value, *fields;
     if (_PyObject_LookupAttr((PyObject*)Py_TYPE(self), state->_fields, &fields) < 0) {
         goto cleanup;
     }