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

dpgeorge · dpgeorge · commit 30b42dd72d4a · 2017-02-16T18:38:06.000+11:00
diff --git a/py/compile.c b/py/compile.c
@@ -1484,7 +1484,7 @@ STATIC void compile_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
         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 @@ STATIC void compile_scope_comp_iter(compiler_t *comp, mp_parse_node_struct_t *pn
 
     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) {
diff --git a/py/emit.h b/py/emit.h
@@ -112,7 +112,7 @@ typedef struct _emit_method_table_t {
     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_setup_finally(emit_t *emit, mp_uint_t label);
 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);
diff --git a/py/emitbc.c b/py/emitbc.c
@@ -787,8 +787,8 @@ void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label) {
     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) {
diff --git a/py/emitnative.c b/py/emitnative.c
@@ -1827,10 +1827,10 @@ STATIC void emit_native_for_iter(emit_t *emit, mp_uint_t label) {
     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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1484,7 +1484,7 @@ STATIC void compile_for_stmt(compiler_t comp, mp_parse_node_struct_t pns) {`
`1484`	`1484`	`EMIT_ARG(jump, continue_label);`
`1485`	`1485`	`}`
`1486`	`1486`	`EMIT_ARG(label_assign, pop_label);`
`1487`		`- EMIT_ARG(for_iter_end, true);`
	`1487`	`+ EMIT(for_iter_end);`
`1488`	`1488`
`1489`	`1489`	`// break/continue apply to outer loop (if any) in the else block`
`1490`	`1490`	`END_BREAK_CONTINUE_BLOCK`
`@@ -2906,7 +2906,7 @@ STATIC void compile_scope_comp_iter(compiler_t comp, mp_parse_node_struct_t pn`
`2906`	`2906`
`2907`	`2907`	`EMIT_ARG(jump, l_top);`
`2908`	`2908`	`EMIT_ARG(label_assign, l_end);`
`2909`		`- EMIT_ARG(for_iter_end, true);`
	`2909`	`+ EMIT(for_iter_end);`
`2910`	`2910`	`}`
`2911`	`2911`
`2912`	`2912`	`STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {`
Original file line number	Diff line number	Diff line change
`@@ -787,8 +787,8 @@ void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label) {`
`787`	`787`	`emit_write_bytecode_byte_unsigned_label(emit, MP_BC_FOR_ITER, label);`
`788`	`788`	`}`
`789`	`789`
`790`		`-void mp_emit_bc_for_iter_end(emit_t *emit, bool use_stack) {`
`791`		`- emit_bc_pre(emit, -(use_stack ? sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t) : 1));`
	`790`	`+void mp_emit_bc_for_iter_end(emit_t *emit) {`
	`791`	`+ emit_bc_pre(emit, -(sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t)));`
`792`	`792`	`}`
`793`	`793`
`794`	`794`	`void mp_emit_bc_pop_block(emit_t *emit) {`
Original file line number	Diff line number	Diff line change
`@@ -1827,10 +1827,10 @@ STATIC void emit_native_for_iter(emit_t *emit, mp_uint_t label) {`
`1827`	`1827`	`emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);`
`1828`	`1828`	`}`
`1829`	`1829`
`1830`		`-STATIC void emit_native_for_iter_end(emit_t *emit, bool use_stack) {`
	`1830`	`+STATIC void emit_native_for_iter_end(emit_t *emit) {`
`1831`	`1831`	`// adjust stack counter (we get here from for_iter ending, which popped the value for us)`
`1832`	`1832`	`emit_native_pre(emit);`
`1833`		`- adjust_stack(emit, -(use_stack ? sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t) : 1));`
	`1833`	`+ adjust_stack(emit, -(sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t)));`
`1834`	`1834`	`emit_post(emit);`
`1835`	`1835`	`}`
`1836`	`1836`