Commita731dce

committed

fix merge

1 parentaadb482 commita731dceCopy full SHA for a731dce

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1587,10 +1587,7 @@ unicodekeys_lookup_unicode_threadsafe_stackref(PyDictKeysObject* dk, PyObject *k`
`1587`	`1587`	`assert(PyUnicode_CheckExact(key));`
`1588`	`1588`	`assert(dk->dk_kind==DICT_KEYS_UNICODE);`
`1589`	`1589`	`Py_ssize_tix=unicodekeys_lookup_unicode_threadsafe(dk,key,hash);`
`1590`		`-if (ix==DKIX_EMPTY) {`
`1591`		`-*value_addr=PyStackRef_NULL;`
`1592`		`-returnDKIX_EMPTY;`
`1593`		`- }elseif (ix >=0) {`
	`1590`	`+if (ix >=0) {`
`1594`	`1591`	`PyObject**addr_of_value=&DK_UNICODE_ENTRIES(dk)[ix].me_value;`
`1595`	`1592`	`PyObject*value=_Py_atomic_load_ptr(addr_of_value);`
`1596`	`1593`	`if (value==NULL) {`
`@@ -1606,6 +1603,8 @@ unicodekeys_lookup_unicode_threadsafe_stackref(PyDictKeysObject* dk, PyObject *k`
`1606`	`1603`	`returnix;`
`1607`	`1604`	`}`
`1608`	`1605`	`}`
	`1606`	`+*value_addr=PyStackRef_NULL;`
	`1607`	`+returnix;`
`1609`	`1608`	`}`
`1610`	`1609`
`1611`	`1610`

Comments

(0)