Adjust exit point in loop_pop(); fix #3541

matz · matz · commit 666787beb236 · 2017-04-03T12:41:27.000+09:00
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
@@ -2956,10 +2956,10 @@ loop_break(codegen_scope *s, node *tree)
 static void
 loop_pop(codegen_scope *s, int val)
 {
+  dispatch_linked(s, s->loop->pc3);
   if (val) {
     genop(s, MKOP_A(OP_LOADNIL, cursp()));
   }
-  dispatch_linked(s, s->loop->pc3);
   s->loop = s->loop->prev;
   if (val) push();
 }

Original file line number	Diff line number	Diff line change
`@@ -2956,10 +2956,10 @@ loop_break(codegen_scope s, node tree)`
`2956`	`2956`	`static void`
`2957`	`2957`	`loop_pop(codegen_scope *s, int val)`
`2958`	`2958`	`{`
	`2959`	`+ dispatch_linked(s, s->loop->pc3);`
`2959`	`2960`	`if (val) {`
`2960`	`2961`	`genop(s, MKOP_A(OP_LOADNIL, cursp()));`
`2961`	`2962`	`}`
`2962`		`- dispatch_linked(s, s->loop->pc3);`
`2963`	`2963`	`s->loop = s->loop->prev;`
`2964`	`2964`	`if (val) push();`
`2965`	`2965`	`}`