undo some unnecessary changes

JelleZijlstra · JelleZijlstra · commit e36c5f53858f · 2023-04-21T14:13:25.000-06:00
diff --git a/Include/internal/pycore_symtable.h b/Include/internal/pycore_symtable.h
@@ -10,7 +10,7 @@ extern "C" {
 
 struct _mod;   // Type defined in pycore_ast.h
 
-typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock, AnnotationBlock, TypeParamBlock }
+typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock, AnnotationBlock }
     _Py_block_ty;
 
 typedef enum _comprehension_type {
@@ -49,11 +49,6 @@ typedef struct _symtable_entry {
     PyObject *ste_varnames;  /* list of function parameters */
     PyObject *ste_children;  /* list of child blocks */
     PyObject *ste_directives;/* locations of global and nonlocal statements */
-    int ste_active_typeparam_scope; /* 0 if no active typeparam scope */
-    int ste_num_typeparam_scopes; /* number of typeparam scopes encountered */
-    PyObject *ste_typeparam_map; /* map of typeparam names to mangled names,
-                                    only exists while we're in ste_active_typeparam_scope */
-    PyObject *ste_parent_typeparam_map; /* same, but represents typeparams present in parents */
     _Py_block_ty ste_type;   /* module, class, function or annotation */
     int ste_nested;      /* true if block is nested */
     unsigned ste_free : 1;        /* true if block has free variables */
@@ -109,7 +104,6 @@ extern PyObject* _Py_Mangle(PyObject *p, PyObject *name);
 #define DEF_IMPORT 2<<6        /* assignment occurred via import */
 #define DEF_ANNOT 2<<7         /* this name is annotated */
 #define DEF_COMP_ITER 2<<8     /* this name is a comprehension iteration variable */
-#define DEF_TYPE_PARAM 2<<9    /* this name is a type parameter */
 
 #define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT)
 
diff --git a/Python/compile.c b/Python/compile.c
@@ -196,7 +196,6 @@ enum {
     COMPILER_SCOPE_ASYNC_FUNCTION,
     COMPILER_SCOPE_LAMBDA,
     COMPILER_SCOPE_COMPREHENSION,
-    COMPILER_SCOPE_TYPE_PARAMS,
 };
 
 typedef struct {
@@ -1274,7 +1273,6 @@ compiler_enter_scope(struct compiler *c, identifier name,
         compiler_unit_free(u);
         return ERROR;
     }
-    u->u_ste->ste_num_typeparam_scopes = 0;
     u->u_name = Py_NewRef(name);
     u->u_varnames = list2dict(u->u_ste->ste_varnames);
     u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0);
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -635,9 +635,6 @@ update_symbols(PyObject *symbols, PyObject *scopes,
         long scope, flags;
         assert(PyLong_Check(v));
         flags = PyLong_AS_LONG(v);
-        if (flags & DEF_TYPE_PARAM) {
-            continue;
-        }
         v_scope = PyDict_GetItemWithError(scopes, name);
         assert(v_scope && PyLong_Check(v_scope));
         scope = PyLong_AS_LONG(v_scope);
