Merge branch 'bouk-retry-codegen-misalign'

2 files changed, 20 insertions, 0 deletions

diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
index 5f42bf08d..8de15aee3 100644
--- a/mrbgems/mruby-compiler/core/codegen.c
+++ b/mrbgems/mruby-compiler/core/codegen.c
@@ -2030,6 +2030,7 @@ codegen(codegen_scope *s, node *tree, int val)
       }
       genop(s, MKOP_sBx(OP_JMP, s->loop->pc2 - s->pc));
     }
+    if (val) push();
     break;
 
   case NODE_RETRY:
@@ -2064,6 +2065,7 @@ codegen(codegen_scope *s, node *tree, int val)
           genop(s, MKOP_sBx(OP_JMP, lp->pc1 - s->pc));
         }
       }
+      if (val) push();
     }
     break;
 
diff --git a/test/t/codegen.rb b/test/t/codegen.rb
index cb2e75f93..7177053ae 100644
--- a/test/t/codegen.rb
+++ b/test/t/codegen.rb
@@ -13,3 +13,21 @@ end
 assert('empty condition in ternary expression parses correctly') do
   assert_equal(() ? 1 : 2, 2)
 end
+
+assert('codegen absorbs arguments to redo and retry if they are the argument of a call') do
+  assert_nothing_raised do
+    a=*"1", case nil
+    when 1
+      redo |
+      1
+    end
+  end
+
+  assert_nothing_raised do
+    a=*"1", case nil
+    when 1
+      retry |
+      1
+    end
+  end
+end