commit 30b42dd72d4aa310e8c96ccbaf75150f8649c262
author Damien George <damien.p.george@gmail.com> Tue Jan 17 15:30:18 2017 +1100
committer Damien George <damien.p.george@gmail.com> Thu Feb 16 18:38:06 2017 +1100
tree b323ad8196ee494c2f3b76d455dc7a58b2d0ab10
parent 088740ecc40476fd0796a3ef6a68ee7c677eae64

py: Remove unused "use_stack" argument from for_iter_end emit function.

py/compile.c

diff --git a/py/compile.c b/py/compile.c
index 5ea7bb4..3967350 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1484,7 +1484,7 @@
         EMIT_ARG(jump, continue_label);
     }
     EMIT_ARG(label_assign, pop_label);
-    EMIT_ARG(for_iter_end, true);
+    EMIT(for_iter_end);
 
     // break/continue apply to outer loop (if any) in the else block
     END_BREAK_CONTINUE_BLOCK
@@ -2906,7 +2906,7 @@
 
     EMIT_ARG(jump, l_top);
     EMIT_ARG(label_assign, l_end);
-    EMIT_ARG(for_iter_end, true);
+    EMIT(for_iter_end);
 }
 
 STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {

py/emit.h

diff --git a/py/emit.h b/py/emit.h
index 6acae9e..64bb957 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -112,7 +112,7 @@
     void (*end_finally)(emit_t *emit);
     void (*get_iter)(emit_t *emit, bool use_stack);
     void (*for_iter)(emit_t *emit, mp_uint_t label);
-    void (*for_iter_end)(emit_t *emit, bool use_stack);
+    void (*for_iter_end)(emit_t *emit);
     void (*pop_block)(emit_t *emit);
     void (*pop_except)(emit_t *emit);
     void (*unary_op)(emit_t *emit, mp_unary_op_t op);
@@ -230,7 +230,7 @@
 void mp_emit_bc_end_finally(emit_t *emit);
 void mp_emit_bc_get_iter(emit_t *emit, bool use_stack);
 void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label);
-void mp_emit_bc_for_iter_end(emit_t *emit, bool use_stack);
+void mp_emit_bc_for_iter_end(emit_t *emit);
 void mp_emit_bc_pop_block(emit_t *emit);
 void mp_emit_bc_pop_except(emit_t *emit);
 void mp_emit_bc_unary_op(emit_t *emit, mp_unary_op_t op);

py/emitbc.c

diff --git a/py/emitbc.c b/py/emitbc.c
index caa6761..0076c14 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -787,8 +787,8 @@
     emit_write_bytecode_byte_unsigned_label(emit, MP_BC_FOR_ITER, label);
 }
 
-void mp_emit_bc_for_iter_end(emit_t *emit, bool use_stack) {
-    emit_bc_pre(emit, -(use_stack ? sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t) : 1));
+void mp_emit_bc_for_iter_end(emit_t *emit) {
+    emit_bc_pre(emit, -(sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t)));
 }
 
 void mp_emit_bc_pop_block(emit_t *emit) {

py/emitnative.c

diff --git a/py/emitnative.c b/py/emitnative.c
index ffc4d91..9176f0a 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1827,10 +1827,10 @@
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_for_iter_end(emit_t *emit, bool use_stack) {
+STATIC void emit_native_for_iter_end(emit_t *emit) {
     // adjust stack counter (we get here from for_iter ending, which popped the value for us)
     emit_native_pre(emit);
-    adjust_stack(emit, -(use_stack ? sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t) : 1));
+    adjust_stack(emit, -(sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t)));
     emit_post(emit);
 }