Skip to content

Commit e6003f4

Browse files
dpgeorgedpgeorge
committed
py: De-optimise some uses of mp_getiter, so they don't use the C stack.
In these cases the heap is anyway used to create a new object so no real need to use the C stack for iterating. It saves a few bytes of code size.
1 parent 019048a commit e6003f4

6 files changed

Lines changed: 13 additions & 26 deletions

File tree

‎py/objarray.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
141141

142142
mp_obj_array_t *array = array_new(typecode, len);
143143

144-
mp_obj_iter_buf_t iter_buf;
145-
mp_obj_t iterable = mp_getiter(initializer, &iter_buf);
144+
mp_obj_t iterable = mp_getiter(initializer, NULL);
146145
mp_obj_t item;
147146
size_t i = 0;
148147
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {

‎py/objdict.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
250250

251251
// this is a classmethod
252252
STATIC mp_obj_t dict_fromkeys(size_t n_args, const mp_obj_t *args) {
253-
mp_obj_iter_buf_t iter_buf;
254-
mp_obj_t iter = mp_getiter(args[1], &iter_buf);
253+
mp_obj_t iter = mp_getiter(args[1], NULL);
255254
mp_obj_t value = mp_const_none;
256255
mp_obj_t next = MP_OBJ_NULL;
257256

@@ -377,12 +376,10 @@ STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwarg
377376
}
378377
} else {
379378
// update from a generic iterable of pairs
380-
mp_obj_iter_buf_t iter_buf;
381-
mp_obj_t iter = mp_getiter(args[1], &iter_buf);
379+
mp_obj_t iter = mp_getiter(args[1], NULL);
382380
mp_obj_t next = MP_OBJ_NULL;
383381
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
384-
mp_obj_iter_buf_t inner_iter_buf;
385-
mp_obj_t inneriter = mp_getiter(next, &inner_iter_buf);
382+
mp_obj_t inneriter = mp_getiter(next, NULL);
386383
mp_obj_t key = mp_iternext(inneriter);
387384
mp_obj_t value = mp_iternext(inneriter);
388385
mp_obj_t stop = mp_iternext(inneriter);

‎py/objlist.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
6060
}
6161

6262
STATIC mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) {
63-
mp_obj_iter_buf_t iter_buf;
64-
mp_obj_t iter = mp_getiter(iterable, &iter_buf);
63+
mp_obj_t iter = mp_getiter(iterable, NULL);
6564
mp_obj_t item;
6665
while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
6766
mp_obj_list_append(list, item);

‎py/objset.c‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ STATIC mp_obj_t set_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
129129
default: { // can only be 0 or 1 arg
130130
// 1 argument, an iterable from which we make a new set
131131
mp_obj_t set = mp_obj_new_set(0, NULL);
132-
mp_obj_iter_buf_t iter_buf;
133-
mp_obj_t iterable = mp_getiter(args[0], &iter_buf);
132+
mp_obj_t iterable = mp_getiter(args[0], NULL);
134133
mp_obj_t item;
135134
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
136135
mp_obj_set_store(set, item);
@@ -235,8 +234,7 @@ STATIC mp_obj_t set_diff_int(size_t n_args, const mp_obj_t *args, bool update) {
235234
if (self == other) {
236235
set_clear(self);
237236
} else {
238-
mp_obj_iter_buf_t iter_buf;
239-
mp_obj_t iter = mp_getiter(other, &iter_buf);
237+
mp_obj_t iter = mp_getiter(other, NULL);
240238
mp_obj_t next;
241239
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
242240
set_discard(self, next);
@@ -273,8 +271,7 @@ STATIC mp_obj_t set_intersect_int(mp_obj_t self_in, mp_obj_t other, bool update)
273271
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
274272
mp_obj_set_t *out = MP_OBJ_TO_PTR(mp_obj_new_set(0, NULL));
275273

276-
mp_obj_iter_buf_t iter_buf;
277-
mp_obj_t iter = mp_getiter(other, &iter_buf);
274+
mp_obj_t iter = mp_getiter(other, NULL);
278275
mp_obj_t next;
279276
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
280277
if (mp_set_lookup(&self->set, next, MP_MAP_LOOKUP)) {
@@ -414,8 +411,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_remove_obj, set_remove);
414411
STATIC mp_obj_t set_symmetric_difference_update(mp_obj_t self_in, mp_obj_t other_in) {
415412
check_set(self_in);
416413
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
417-
mp_obj_iter_buf_t iter_buf;
418-
mp_obj_t iter = mp_getiter(other_in, &iter_buf);
414+
mp_obj_t iter = mp_getiter(other_in, NULL);
419415
mp_obj_t next;
420416
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
421417
mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND_OR_REMOVE_IF_FOUND);
@@ -434,8 +430,7 @@ STATIC mp_obj_t set_symmetric_difference(mp_obj_t self_in, mp_obj_t other_in) {
434430
STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_obj, set_symmetric_difference);
435431

436432
STATIC void set_update_int(mp_obj_set_t *self, mp_obj_t other_in) {
437-
mp_obj_iter_buf_t iter_buf;
438-
mp_obj_t iter = mp_getiter(other_in, &iter_buf);
433+
mp_obj_t iter = mp_getiter(other_in, NULL);
439434
mp_obj_t next;
440435
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
441436
mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);

‎py/objtuple.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ STATIC mp_obj_t mp_obj_tuple_make_new(const mp_obj_type_t *type_in, size_t n_arg
8282
size_t len = 0;
8383
mp_obj_t *items = m_new(mp_obj_t, alloc);
8484

85-
mp_obj_iter_buf_t iter_buf;
86-
mp_obj_t iterable = mp_getiter(args[0], &iter_buf);
85+
mp_obj_t iterable = mp_getiter(args[0], NULL);
8786
mp_obj_t item;
8887
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
8988
if (len >= alloc) {

‎py/runtime.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -745,8 +745,7 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
745745
// get the keys iterable
746746
mp_obj_t dest[3];
747747
mp_load_method(kw_dict, MP_QSTR_keys, dest);
748-
mp_obj_iter_buf_t iter_buf;
749-
mp_obj_t iterable = mp_getiter(mp_call_method_n_kw(0, 0, dest), &iter_buf);
748+
mp_obj_t iterable = mp_getiter(mp_call_method_n_kw(0, 0, dest), NULL);
750749

751750
mp_obj_t key;
752751
while ((key = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
@@ -877,8 +876,7 @@ void mp_unpack_ex(mp_obj_t seq_in, size_t num_in, mp_obj_t *items) {
877876
// items destination array, then the rest to a dynamically created list. Once the
878877
// iterable is exhausted, we take from this list for the right part of the items.
879878
// TODO Improve to waste less memory in the dynamically created list.
880-
mp_obj_iter_buf_t iter_buf;
881-
mp_obj_t iterable = mp_getiter(seq_in, &iter_buf);
879+
mp_obj_t iterable = mp_getiter(seq_in, NULL);
882880
mp_obj_t item;
883881
for (seq_len = 0; seq_len < num_left; seq_len++) {
884882
item = mp_iternext(iterable);

0 commit comments

Comments
 (0)