commit e6003f466e6f5b7eddd01740666230b62ab5a872
author Damien George <damien.p.george@gmail.com> Mon Feb 13 15:44:31 2017 +1100
committer Damien George <damien.p.george@gmail.com> Thu Feb 16 19:11:34 2017 +1100
tree 01dabf002737d9960c822623f9f54316a8143c4a
parent 019048a6dc0783515e7fba4255dd2b22265d1059

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.

py/objset.c

diff --git a/py/objset.c b/py/objset.c
index 99e1e8c..f74bc74 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -129,8 +129,7 @@
         default: { // can only be 0 or 1 arg
             // 1 argument, an iterable from which we make a new set
             mp_obj_t set = mp_obj_new_set(0, NULL);
-            mp_obj_iter_buf_t iter_buf;
-            mp_obj_t iterable = mp_getiter(args[0], &iter_buf);
+            mp_obj_t iterable = mp_getiter(args[0], NULL);
             mp_obj_t item;
             while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
                 mp_obj_set_store(set, item);
@@ -235,8 +234,7 @@
         if (self == other) {
             set_clear(self);
         } else {
-            mp_obj_iter_buf_t iter_buf;
-            mp_obj_t iter = mp_getiter(other, &iter_buf);
+            mp_obj_t iter = mp_getiter(other, NULL);
             mp_obj_t next;
             while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
                 set_discard(self, next);
@@ -273,8 +271,7 @@
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_set_t *out = MP_OBJ_TO_PTR(mp_obj_new_set(0, NULL));
 
-    mp_obj_iter_buf_t iter_buf;
-    mp_obj_t iter = mp_getiter(other, &iter_buf);
+    mp_obj_t iter = mp_getiter(other, NULL);
     mp_obj_t next;
     while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
         if (mp_set_lookup(&self->set, next, MP_MAP_LOOKUP)) {
@@ -414,8 +411,7 @@
 STATIC mp_obj_t set_symmetric_difference_update(mp_obj_t self_in, mp_obj_t other_in) {
     check_set(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_iter_buf_t iter_buf;
-    mp_obj_t iter = mp_getiter(other_in, &iter_buf);
+    mp_obj_t iter = mp_getiter(other_in, NULL);
     mp_obj_t next;
     while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
         mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND_OR_REMOVE_IF_FOUND);
@@ -434,8 +430,7 @@
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_obj, set_symmetric_difference);
 
 STATIC void set_update_int(mp_obj_set_t *self, mp_obj_t other_in) {
-    mp_obj_iter_buf_t iter_buf;
-    mp_obj_t iter = mp_getiter(other_in, &iter_buf);
+    mp_obj_t iter = mp_getiter(other_in, NULL);
     mp_obj_t next;
     while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
         mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);