Fix subclasses

python · JelleZijlstra · Feb 28, 2024 · Jun 17, 2023 · Jun 22, 2023 · Jun 22, 2023
commit c74740a08446e5378547fb9810d3d1c830e2ab64
diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -239,6 +239,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(_check_retval_)
         STRUCT_FOR_ID(_dealloc_warn)
         STRUCT_FOR_ID(_feature_version)
+        STRUCT_FOR_ID(_field_types)
         STRUCT_FOR_ID(_fields_)
         STRUCT_FOR_ID(_finalizing)
         STRUCT_FOR_ID(_find_and_load)

diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
diff --git a/Include/internal/pycore_unicodeobject_generated.h b/Include/internal/pycore_unicodeobject_generated.h
@@ -819,9 +819,11 @@ def emit_annotations(self, name, fields):
             self.emit("Py_DECREF(type);", 2)
             self.emit_annotations_error(name, 2)
             self.emit("}", 1)
+        self.emit(f'cond = PyObject_SetAttrString(state->{name}_type, "_field_types", {name}_annotations) == 0;', 1)
+        self.emit_annotations_error(name, 1)
         self.emit(f'cond = PyObject_SetAttrString(state->{name}_type, "__annotations__", {name}_annotations) == 0;', 1)
+        self.emit_annotations_error(name, 1)
         self.emit(f"Py_DECREF({name}_annotations);", 1)
-        self.emit("if (!cond) return 0;", 1)
 
     def emit_annotations_error(self, name, depth):
         self.emit("if (!cond) {", depth)
@@ -968,9 +970,9 @@ def visitModule(self, mod):
         }
     }
     Py_ssize_t size = PySet_Size(remaining_fields);
-    PyObject *annotations = NULL, *remaining_list = NULL;
+    PyObject *field_types = NULL, *remaining_list = NULL;
     if (size > 0) {
-        if (!_PyObject_LookupAttr((PyObject*)Py_TYPE(self), &_Py_ID(__annotations__), &annotations)) {
+        if (!_PyObject_LookupAttr((PyObject*)Py_TYPE(self), &_Py_ID(_field_types), &field_types)) {
             res = -1;
             goto cleanup;
         }
@@ -980,7 +982,7 @@ def visitModule(self, mod):
         }
         for (Py_ssize_t i = 0; i < size; i++) {
             PyObject *name = PyList_GET_ITEM(remaining_list, i);
-            PyObject *type = PyDict_GetItemWithError(annotations, name);
+            PyObject *type = PyDict_GetItemWithError(field_types, name);
             if (!type) {
                 if (!PyErr_Occurred()) {
                     PyErr_SetObject(PyExc_KeyError, name);
@@ -1022,7 +1024,7 @@ def visitModule(self, mod):
     return res;
   set_remaining_cleanup:
     Py_XDECREF(remaining_list);
-    Py_XDECREF(annotations);
+    Py_XDECREF(field_types);
     res = -1;
     goto cleanup;
 }