Fix up qualnames

JelleZijlstra · JelleZijlstra · commit b9d8fbb0ab9f · 2023-04-23T13:29:32.000-06:00
diff --git a/Python/compile.c b/Python/compile.c
@@ -196,6 +196,7 @@ enum {
     COMPILER_SCOPE_ASYNC_FUNCTION,
     COMPILER_SCOPE_LAMBDA,
     COMPILER_SCOPE_COMPREHENSION,
+    COMPILER_SCOPE_TYPEPARAMS,
 };
 
 typedef struct {
@@ -780,6 +781,19 @@ compiler_set_qualname(struct compiler *c)
         capsule = PyList_GET_ITEM(c->c_stack, stack_size - 1);
         parent = (struct compiler_unit *)PyCapsule_GetPointer(capsule, CAPSULE_NAME);
         assert(parent);
+        if (parent->u_scope_type == COMPILER_SCOPE_TYPEPARAMS) {
+            /* The parent is a type parameter scope, so we need to
+               look at the grandparent. */
+            if (stack_size == 2) {
+                // If we're immediately within the module, we can skip
+                // the rest and just set the qualname to be the same as name.
+                u->u_qualname = Py_NewRef(u->u_name);
+                return SUCCESS;
+            }
+            capsule = PyList_GET_ITEM(c->c_stack, stack_size - 2);
+            parent = (struct compiler_unit *)PyCapsule_GetPointer(capsule, CAPSULE_NAME);
+            assert(parent);
+        }
 
         if (u->u_scope_type == COMPILER_SCOPE_FUNCTION
             || u->u_scope_type == COMPILER_SCOPE_ASYNC_FUNCTION
@@ -2242,7 +2256,7 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async)
         if (!typeparams_name) {
             return ERROR;
         }
-        if (compiler_enter_scope(c, typeparams_name, COMPILER_SCOPE_FUNCTION,
+        if (compiler_enter_scope(c, typeparams_name, COMPILER_SCOPE_TYPEPARAMS,
                                  (void *)typeparams, firstlineno) == -1) {
             Py_DECREF(typeparams_name);
             return ERROR;
@@ -2355,7 +2369,7 @@ compiler_class(struct compiler *c, stmt_ty s)
         if (!typeparams_name) {
             return ERROR;
         }
-        if (compiler_enter_scope(c, typeparams_name, COMPILER_SCOPE_FUNCTION,
+        if (compiler_enter_scope(c, typeparams_name, COMPILER_SCOPE_TYPEPARAMS,
                                  (void *)typeparams, firstlineno) == -1) {
             Py_DECREF(typeparams_name);
             return ERROR;
