Same for type aliases

JelleZijlstra · JelleZijlstra · commit 2e913ca083c6 · 2023-04-26T18:31:12.000-06:00
diff --git a/Python/compile.c b/Python/compile.c
@@ -2540,6 +2540,7 @@ compiler_typealias(struct compiler *c, stmt_ty s)
     RETURN_IF_ERROR(compiler_add_const(c->c_const_cache, c->u, Py_None));
     VISIT_IN_SCOPE(c, expr, s->v.TypeAlias.value);
     ADDOP_IN_SCOPE(c, loc, RETURN_VALUE);
+    int is_in_class = c->u->u_ste->ste_type_params_in_class;
     PyCodeObject *co = optimize_and_assemble(c, 1);
     compiler_exit_scope(c);
     if (co == NULL) {
@@ -2550,6 +2551,10 @@ compiler_typealias(struct compiler *c, stmt_ty s)
         return ERROR;
     }
     Py_DECREF(co);
+    if (is_in_class) {
+        ADDOP(c, loc, LOAD_LOCALS);
+        ADDOP_I(c, loc, CALL_INTRINSIC_2, INTRINSIC_SET_CLASS_DICT);
+    }
     ADDOP_I(c, loc, BUILD_TUPLE, 3);
     ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_TYPEALIAS);
     if (asdl_seq_LEN(typeparams) > 0) {
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1399,6 +1399,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
         VISIT(st, expr, s->v.TypeAlias.name);
         assert(s->v.TypeAlias.name->kind == Name_kind);
         PyObject *name = s->v.TypeAlias.name->v.Name.id;
+        int is_in_class = st->st_cur->ste_type == ClassBlock;
         if (asdl_seq_LEN(s->v.TypeAlias.typeparams) > 0) {
             if (!symtable_enter_typeparam_block(
                     st, name,
@@ -1412,6 +1413,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
         if (!symtable_enter_block(st, name, TypeAliasBlock,
                                   (void *)s, LOCATION(s)))
             VISIT_QUIT(st, 0);
+        st->st_cur->ste_type_params_in_class = is_in_class;
         VISIT(st, expr, s->v.TypeAlias.value);
         if (!symtable_exit_block(st))
             VISIT_QUIT(st, 0);
