Remove unnecessary goto, cleanup code

Author: uriyyo

Objects/funcobject.c

@@ -423,13 +423,13 @@ func_get_annotations(PyFunctionObject *op, void *Py_UNUSED(ignored))
         op->func_annotations = PyDict_New();
         if (op->func_annotations == NULL)
             return NULL;
-
     }
     if (PyTuple_CheckExact(op->func_annotations)) {
         PyObject *ann_tuple = op->func_annotations;
         PyObject *ann_dict = PyDict_New();
-        if (ann_dict == NULL)
+        if (ann_dict == NULL) {
             return NULL;
+        }
 
         assert(PyTuple_GET_SIZE(ann_tuple) % 2 == 0);
 

Python/compile.c

@@ -2072,39 +2072,35 @@ compiler_visit_annotations(struct compiler *c, arguments_ty args,
     Py_ssize_t annotations_len = 0;
 
     if (!compiler_visit_argannotations(c, args->args, &annotations_len))
-        goto error;
+        return 0;
     if (!compiler_visit_argannotations(c, args->posonlyargs, &annotations_len))
-        goto error;
+        return 0;
     if (args->vararg && args->vararg->annotation &&
         !compiler_visit_argannotation(c, args->vararg->arg,
                                      args->vararg->annotation, &annotations_len))
-        goto error;
+        return 0;
     if (!compiler_visit_argannotations(c, args->kwonlyargs, &annotations_len))
-        goto error;
+        return 0;
     if (args->kwarg && args->kwarg->annotation &&
         !compiler_visit_argannotation(c, args->kwarg->arg,
                                      args->kwarg->annotation, &annotations_len))
-        goto error;
+        return 0;
 
     if (!return_str) {
         return_str = PyUnicode_InternFromString("return");
         if (!return_str)
-            goto error;
+            return 0;
     }
     if (!compiler_visit_argannotation(c, return_str, returns, &annotations_len)) {
-        goto error;
+        return 0;
     }
 
     if (annotations_len) {
         ADDOP_I(c, BUILD_TUPLE, annotations_len);
         return 1;
     }
-    else {
-        return -1;
-    }
 
-error:
-    return 0;
+    return -1;
 }
 
 static int
@@ -6449,3 +6445,4 @@ PyCode_Optimize(PyObject *code, PyObject* Py_UNUSED(consts),
     Py_INCREF(code);
     return code;
 }
+