Raise error if there isn't already one

isidentical · isidentical · commit e4778a8ff17d · 2020-03-18T18:54:29.000+03:00
diff --git a/Python/ast.c b/Python/ast.c
@@ -111,8 +111,6 @@ validate_arguments(arguments_ty args)
 static int
 validate_constant(PyObject *value)
 {
-    PyObject *invalid_value = value;
-
     if (value == Py_None || value == Py_Ellipsis)
         return 1;
 
@@ -128,25 +126,23 @@ validate_constant(PyObject *value)
         PyObject *it;
 
         it = PyObject_GetIter(value);
-        if (it == NULL) {
-            goto invalid;
-        }
+        if (it == NULL)
+            return 0;
 
         while (1) {
             PyObject *item = PyIter_Next(it);
             if (item == NULL) {
                 if (PyErr_Occurred()) {
                     Py_DECREF(it);
-                    goto invalid;
+                    return 0;
                 }
                 break;
             }
 
             if (!validate_constant(item)) {
-                invalid_value = item;
                 Py_DECREF(it);
                 Py_DECREF(item);
-                goto invalid;
+                return 0;
             }
             Py_DECREF(item);
         }
@@ -155,12 +151,11 @@ validate_constant(PyObject *value)
         return 1;
     }
 
-    goto invalid;
-
-  invalid:
-    PyErr_Format(PyExc_TypeError,
-                 "got an invalid type in Constant: %s",
-                 _PyType_Name(Py_TYPE(invalid_value)));
+    if (!PyErr_Occurred()) {
+        PyErr_Format(PyExc_TypeError,
+                     "got an invalid type in Constant: %s",
+                     _PyType_Name(Py_TYPE(value)));
+    }
     return 0;
 }
 
