merge 3.5

This commit is contained in:
Benjamin Peterson 2016-09-06 19:04:37 -07:00
commit 35b40c65f6
1 changed files with 2 additions and 1 deletions

View File

@ -338,7 +338,8 @@ _Py_hashtable_set(_Py_hashtable_t *ht, size_t key_size, const void *pkey,
entry->key_hash = key_hash;
Py_MEMCPY((void *)_Py_HASHTABLE_ENTRY_PKEY(entry), pkey, ht->key_size);
ENTRY_WRITE_PDATA(ht, entry, data_size, data);
if (data)
ENTRY_WRITE_PDATA(ht, entry, data_size, data);
_Py_slist_prepend(&ht->buckets[index], (_Py_slist_item_t*)entry);
ht->entries++;