Use __static_attributes__ to initialize shared keys

Include/internal/pycore_dict.h

@@ -81,7 +81,7 @@ typedef struct {
  PyObject *me_value; /* This field is only meaningful for combined tables */
 } PyDictUnicodeEntry;
 
-extern PyDictKeysObject *_PyDict_NewKeysForClass(void);
+extern PyDictKeysObject *_PyDict_NewKeysForClass(PyHeapTypeObject *);
 extern PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
 
 /* Gets a version number unique to the current state of the keys of dict, if possible.

Objects/dictobject.c

@@ -6586,9 +6586,10 @@ dictvalues_reversed(PyObject *self, PyObject *Py_UNUSED(ignored))
 /* Returns NULL if cannot allocate a new PyDictKeysObject,
  but does not set an error */
 PyDictKeysObject *
-_PyDict_NewKeysForClass(void)
+_PyDict_NewKeysForClass(PyHeapTypeObject *cls)
 {
  PyInterpreterState *interp = _PyInterpreterState_GET();
+
  PyDictKeysObject *keys = new_keys_object(
  interp, NEXT_LOG2_SHARED_KEYS_MAX_SIZE, 1);
  if (keys == NULL) {
@@ -6600,6 +6601,18 @@ _PyDict_NewKeysForClass(void)
  keys->dk_usable = SHARED_KEYS_MAX_SIZE;
  keys->dk_kind = DICT_KEYS_SPLIT;
  }
+ if (cls->ht_type.tp_dict) {
+ PyObject *attrs = PyDict_GetItem(cls->ht_type.tp_dict, &_Py_ID(__static_attributes__));
+ if (attrs != NULL && PyTuple_Check(attrs)) {
+ for (Py_ssize_t i; i < PyTuple_GET_SIZE(attrs); i++) {
+ PyObject *key = PyTuple_GET_ITEM(attrs, i);
+ Py_hash_t hash;
+ if (PyUnicode_CheckExact(key) && (hash = unicode_get_hash(key)) != -1) {
+ insert_split_key(keys, key, hash);
+ }
+ }
+ }
+ }
  return keys;
 }
 

Objects/typeobject.c

@@ -7883,7 +7883,7 @@ type_ready_managed_dict(PyTypeObject *type)
  }
  PyHeapTypeObject* et = (PyHeapTypeObject*)type;
  if (et->ht_cached_keys == NULL) {
- et->ht_cached_keys = _PyDict_NewKeysForClass();
+ et->ht_cached_keys = _PyDict_NewKeysForClass(et);
  if (et->ht_cached_keys == NULL) {
  PyErr_NoMemory();
  return -1;