Commitdedffa7

committed

Use __static_attributes__ to initialize shared keys

1 parent21c09d9 commitdedffa7Copy full SHA for dedffa7

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ typedef struct {`
`81`	`81`	`PyObjectme_value;/ This field is only meaningful for combined tables */`
`82`	`82`	`}PyDictUnicodeEntry;`
`83`	`83`
`84`		`-externPyDictKeysObject*_PyDict_NewKeysForClass(void);`
	`84`	`+externPyDictKeysObject_PyDict_NewKeysForClass(PyHeapTypeObject);`
`85`	`85`	`externPyObject_PyDict_FromKeys(PyObject,PyObject,PyObject);`
`86`	`86`
`87`	`87`	`/* Gets a version number unique to the current state of the keys of dict, if possible.`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6586,9 +6586,10 @@ dictvalues_reversed(PyObject self, PyObject Py_UNUSED(ignored))`
`6586`	`6586`	`/* Returns NULL if cannot allocate a new PyDictKeysObject,`
`6587`	`6587`	`but does not set an error */`
`6588`	`6588`	`PyDictKeysObject*`
`6589`		`-_PyDict_NewKeysForClass(void)`
	`6589`	`+_PyDict_NewKeysForClass(PyHeapTypeObject*cls)`
`6590`	`6590`	`{`
`6591`	`6591`	`PyInterpreterState*interp=_PyInterpreterState_GET();`
	`6592`	`+`
`6592`	`6593`	`PyDictKeysObject*keys=new_keys_object(`
`6593`	`6594`	`interp,NEXT_LOG2_SHARED_KEYS_MAX_SIZE,1);`
`6594`	`6595`	`if (keys==NULL) {`
`@@ -6600,6 +6601,18 @@ _PyDict_NewKeysForClass(void)`
`6600`	`6601`	`keys->dk_usable=SHARED_KEYS_MAX_SIZE;`
`6601`	`6602`	`keys->dk_kind=DICT_KEYS_SPLIT;`
`6602`	`6603`	`}`
	`6604`	`+if (cls->ht_type.tp_dict) {`
	`6605`	`+PyObject*attrs=PyDict_GetItem(cls->ht_type.tp_dict,&_Py_ID(__static_attributes__));`
	`6606`	`+if (attrs!=NULL&&PyTuple_Check(attrs)) {`
	`6607`	`+for (Py_ssize_ti;i<PyTuple_GET_SIZE(attrs);i++) {`
	`6608`	`+PyObject*key=PyTuple_GET_ITEM(attrs,i);`
	`6609`	`+Py_hash_thash;`
	`6610`	`+if (PyUnicode_CheckExact(key)&& (hash=unicode_get_hash(key))!=-1) {`
	`6611`	`+insert_split_key(keys,key,hash);`
	`6612`	`+ }`
	`6613`	`+ }`
	`6614`	`+ }`
	`6615`	`+ }`
`6603`	`6616`	`returnkeys;`
`6604`	`6617`	`}`
`6605`	`6618`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7883,7 +7883,7 @@ type_ready_managed_dict(PyTypeObject *type)`
`7883`	`7883`	`}`
`7884`	`7884`	`PyHeapTypeObjectet= (PyHeapTypeObject)type;`
`7885`	`7885`	`if (et->ht_cached_keys==NULL) {`
`7886`		`-et->ht_cached_keys=_PyDict_NewKeysForClass();`
	`7886`	`+et->ht_cached_keys=_PyDict_NewKeysForClass(et);`
`7887`	`7887`	`if (et->ht_cached_keys==NULL) {`
`7888`	`7888`	`PyErr_NoMemory();`
`7889`	`7889`	`return-1;`

Comments

(0)