Naming is hard

Include/cpython/code.h

@@ -93,7 +93,7 @@ struct PyCodeObject {
        Type is a void* to keep the format private in codeobject.c to force
        people to go through the proper APIs. */
     void *co_extra;
-    char _co_code[1];
+    char co_code_adaptive[1];
 };
 
 /* Masks for co_flags above */
@@ -135,7 +135,7 @@ PyAPI_DATA(PyTypeObject) PyCode_Type;
 
 #define PyCode_Check(op) Py_IS_TYPE(op, &PyCode_Type)
 #define PyCode_GetNumFree(op) ((op)->co_nfreevars)
-#define _PyCode_CODE(CO) ((_Py_CODEUNIT *)(CO)->_co_code)
+#define _PyCode_CODE(CO) ((_Py_CODEUNIT *)(CO)->co_code_adaptive)
 #define _PyCode_NBYTES(CO) (Py_SIZE(CO) * (Py_ssize_t)sizeof(_Py_CODEUNIT))
 
 /* Public interface */

Objects/codeobject.c

@@ -1521,9 +1521,9 @@ code_getfreevars(PyCodeObject *code, void *closure)
 }
 
 static PyObject *
-code_getundercode(PyCodeObject *code, void *closure)
+code_getcodeadaptive(PyCodeObject *code, void *closure)
 {
-    return PyMemoryView_FromMemory(code->_co_code, _PyCode_NBYTES(code),
+    return PyMemoryView_FromMemory(code->co_code_adaptive, _PyCode_NBYTES(code),
                                    PyBUF_READ);
 }
 
@@ -1534,13 +1534,13 @@ code_getcode(PyCodeObject *code, void *closure)
 }
 
 static PyGetSetDef code_getsetlist[] = {
-    {"co_lnotab",   (getter)code_getlnotab,    NULL, NULL},
-    {"_co_code",    (getter)code_getundercode, NULL, NULL},
+    {"co_lnotab",         (getter)code_getlnotab,       NULL, NULL},
+    {"_co_code_adaptive", (getter)code_getcodeadaptive, NULL, NULL},
     // The following old names are kept for backward compatibility.
-    {"co_varnames", (getter)code_getvarnames,  NULL, NULL},
-    {"co_cellvars", (getter)code_getcellvars,  NULL, NULL},
-    {"co_freevars", (getter)code_getfreevars,  NULL, NULL},
-    {"co_code",     (getter)code_getcode,      NULL, NULL},
+    {"co_varnames",       (getter)code_getvarnames,     NULL, NULL},
+    {"co_cellvars",       (getter)code_getcellvars,     NULL, NULL},
+    {"co_freevars",       (getter)code_getfreevars,     NULL, NULL},
+    {"co_code",           (getter)code_getcode,         NULL, NULL},
     {0}
 };
 
@@ -1729,7 +1729,7 @@ static struct PyMethodDef code_methods[] = {
 PyTypeObject PyCode_Type = {
     PyVarObject_HEAD_INIT(&PyType_Type, 0)
     "code",
-    offsetof(PyCodeObject, _co_code),
+    offsetof(PyCodeObject, co_code_adaptive),
     sizeof(_Py_CODEUNIT),
     (destructor)code_dealloc,           /* tp_dealloc */
     0,                                  /* tp_vectorcall_offset */

Tools/scripts/deepfreeze.py

@@ -245,6 +245,7 @@ def generate_code(self, name: str, code: types.CodeType) -> str:
         # Derived values
         nlocals, nplaincellvars, ncellvars, nfreevars = \
             get_localsplus_counts(code, localsplusnames, localspluskinds)
+        co_code_adaptive = make_string_literal(code.co_code)
         self.write("static")
         with self.indent():
             with self.block("struct"):
@@ -274,7 +275,7 @@ def generate_code(self, name: str, code: types.CodeType) -> str:
                 self.write("PyObject *co_columntable;")
                 self.write("PyObject *co_weakreflist;")
                 self.write("void *co_extra;")
-                self.write(f"char _co_code[{len(code.co_code)}];")
+                self.write(f"char co_code_adaptive[{len(code.co_code)}];")
         with self.block(f"{name} =", ";"):
             self.object_var_head("PyCode_Type", len(code.co_code) // 2)
             # But the ordering here must match that in cpython/code.h
@@ -303,10 +304,10 @@ def generate_code(self, name: str, code: types.CodeType) -> str:
             self.write(f".co_linetable = {co_linetable},")
             self.write(f".co_endlinetable = {co_endlinetable},")
             self.write(f".co_columntable = {co_columntable},")
-            self.write(f"._co_code = {make_string_literal(code.co_code)},")
-        cast = f"(PyCodeObject *)&{name}"
-        self.deallocs.append(f"_PyStaticCode_Dealloc({cast});")
-        self.interns.append(f"_PyStaticCode_InternStrings({cast})")
+            self.write(f".co_code_adaptive = {co_code_adaptive},")
+        name_as_code = f"(PyCodeObject *)&{name}"
+        self.deallocs.append(f"_PyStaticCode_Dealloc({name_as_code});")
+        self.interns.append(f"_PyStaticCode_InternStrings({name_as_code})")
         return f"& {name}.ob_base.ob_base"
 
     def generate_tuple(self, name: str, t: Tuple[object, ...]) -> str: