djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/objtype: Use mp_obj_dict_copy() for creating obj.__dict__ attribute.

Browse Source 
The resulting dict is now marked as read-only (is_fixed=1) to enforce the
fact that changes to this dict will not be reflected in the class instance.

This commit reduces code size by about 20 bytes, and should be more
efficient because it creates a direct copy of the dict rather than
reinserting all elements.
This commit is contained in:
Andrew Leech 2020-06-10 10:46:38 +10:00 committed by Damien George
parent 28370c0450
commit 95cbe6b65e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
py/objtype.c
View File

@ -588,16 +588,13 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
#if MICROPY_CPYTHON_COMPAT #if MICROPY_CPYTHON_COMPAT
if (attr == MP_QSTR___dict__) { if (attr == MP_QSTR___dict__) {
// Create a new dict with a copy of the instance's map items. // Create a new dict with a copy of the instance's map items.
// This creates, unlike CPython, a 'read-only' __dict__: modifying // This creates, unlike CPython, a read-only __dict__ that can't be modified.
// it will not result in modifications to the actual instance members. mp_obj_dict_t dict;
mp_map_t *map = &self->members; dict.base.type = &mp_type_dict;
mp_obj_t attr_dict = mp_obj_new_dict(map->used); dict.map = self->members;
for (size_t i = 0; i < map->alloc; ++i) { dest[0] = mp_obj_dict_copy(MP_OBJ_FROM_PTR(&dict));
if (mp_map_slot_is_filled(map, i)) { mp_obj_dict_t *dest_dict = MP_OBJ_TO_PTR(dest[0]);
mp_obj_dict_store(attr_dict, map->table[i].key, map->table[i].value); dest_dict->map.is_fixed = 1;
}
}
dest[0] = attr_dict;
return; return;
} }
#endif #endif