Simplify annotations tuple creation

Author: uriyyo

Python/compile.c

@@ -2027,39 +2027,24 @@ compiler_visit_annexpr(struct compiler *c, expr_ty annotation)
 
 static int
 compiler_visit_argannotation(struct compiler *c, identifier id,
-    expr_ty annotation, PyObject *annotations)
+    expr_ty annotation, Py_ssize_t *annotations_len)
 {
     if (annotation) {
-        PyObject *mangled, *value;
-        mangled = _Py_Mangle(c->u->u_private, id);
+        PyObject *mangled = _Py_Mangle(c->u->u_private, id);
         if (!mangled)
             return 0;
-        if (PyList_Append(annotations, mangled) < 0) {
-            Py_DECREF(mangled);
-            return 0;
-        }
-
-        value = _PyAST_ExprAsUnicode(annotation);
-        if (!value) {
-            Py_DECREF(mangled);
-            return 0;
-        }
-
-        if (PyList_Append(annotations, value) < 0) {
-            Py_DECREF(mangled);
-            Py_DECREF(value);
-            return 0;
-        }
 
+        ADDOP_LOAD_CONST(c, mangled);
         Py_DECREF(mangled);
-        Py_DECREF(value);
+        VISIT(c, annexpr, annotation);
+        *annotations_len += 2;
     }
     return 1;
 }
 
 static int
 compiler_visit_argannotations(struct compiler *c, asdl_arg_seq* args,
-                              PyObject *annotations)
+                              Py_ssize_t *annotations_len)
 {
     int i;
     for (i = 0; i < asdl_seq_LEN(args); i++) {
@@ -2068,7 +2053,7 @@ compiler_visit_argannotations(struct compiler *c, asdl_arg_seq* args,
                         c,
                         arg->arg,
                         arg->annotation,
-                        annotations ))
+                        annotations_len))
             return 0;
     }
     return 1;
@@ -2078,56 +2063,47 @@ static int
 compiler_visit_annotations(struct compiler *c, arguments_ty args,
                            expr_ty returns)
 {
-    /* Push arg annotation dict.
+    /* Push arg annotation names and values.
        The expressions are evaluated out-of-order wrt the source code.
 
-       Return 0 on error, -1 if no dict pushed, 1 if a dict is pushed.
+       Return 0 on error, -1 if no annotations pushed, 1 if a annotations is pushed.
        */
     static identifier return_str;
-    PyObject *annotations;
-    Py_ssize_t len;
-    annotations = PyList_New(0);
-    if (!annotations)
-        return 0;
+    Py_ssize_t annotations_len = 0;
 
-    if (!compiler_visit_argannotations(c, args->args, annotations))
+    if (!compiler_visit_argannotations(c, args->args, &annotations_len))
         goto error;
-    if (!compiler_visit_argannotations(c, args->posonlyargs, annotations))
+    if (!compiler_visit_argannotations(c, args->posonlyargs, &annotations_len))
         goto error;
     if (args->vararg && args->vararg->annotation &&
         !compiler_visit_argannotation(c, args->vararg->arg,
-                                     args->vararg->annotation, annotations))
+                                     args->vararg->annotation, &annotations_len))
         goto error;
-    if (!compiler_visit_argannotations(c, args->kwonlyargs, annotations))
+    if (!compiler_visit_argannotations(c, args->kwonlyargs, &annotations_len))
         goto error;
     if (args->kwarg && args->kwarg->annotation &&
         !compiler_visit_argannotation(c, args->kwarg->arg,
-                                     args->kwarg->annotation, annotations))
+                                     args->kwarg->annotation, &annotations_len))
         goto error;
 
     if (!return_str) {
         return_str = PyUnicode_InternFromString("return");
         if (!return_str)
             goto error;
     }
-    if (!compiler_visit_argannotation(c, return_str, returns, annotations)) {
+    if (!compiler_visit_argannotation(c, return_str, returns, &annotations_len)) {
         goto error;
     }
 
-    len = PyList_GET_SIZE(annotations);
-    if (len) {
-        PyObject *annotationstuple = PyList_AsTuple(annotations);
-        Py_DECREF(annotations);
-        ADDOP_LOAD_CONST_NEW(c, annotationstuple);
+    if (annotations_len) {
+        ADDOP_I(c, BUILD_TUPLE, annotations_len);
         return 1;
     }
     else {
-        Py_DECREF(annotations);
         return -1;
     }
 
 error:
-    Py_DECREF(annotations);
     return 0;
 }