requested comment changes

python · JelleZijlstra · Apr 4, 2025 · Jan 11, 2025 · Jan 11, 2025 · Jan 11, 2025
commit 4d736e9d0d9dd7b4eecdd6982749ec2fa0c7b3a5
@@ -534,6 +534,9 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus,
         assert(offset >= 0);
         offset += nlocals - numdropped;
         assert(offset < nlocalsplus);
+        /* XXX If the assertion below fails it is most likely because a freevar
+           was added to u_freevars with the wrong index due to not taking into
+           account cellvars already present, see gh-128632. */
         assert(offset > cellvar_offset);
         _Py_set_localsplus_info(offset, k, CO_FAST_FREE, names, kinds);
     }

diff --git a/Python/codegen.c b/Python/codegen.c
@@ -3065,9 +3065,6 @@ codegen_addop_yield(compiler *c, location loc) {
     return SUCCESS;
 }
 
-/* XXX: Currently if this is used to insert a new name into u_freevars when
-   there are already entries in u_cellvars then the wrong index will be put
-   into u_freevars causing a hard error downstream. */
 static int
 codegen_load_classdict_freevar(compiler *c, location loc)
 {

diff --git a/Python/compile.c b/Python/compile.c
@@ -970,9 +970,6 @@ _PyCompile_ResolveNameop(compiler *c, PyObject *mangled, int scope,
         break;
     }
     if (*optype != COMPILE_OP_FAST) {
-        /* XXX: Currently if this is used to insert a new name into u_freevars when
-           there are already entries in u_cellvars then the wrong index will be put
-           into u_freevars causing a hard error downstream. */
         *arg = _PyCompile_DictAddObj(dict, mangled);
         RETURN_IF_ERROR(*arg);
     }