From 736be0e98b9e1136a4dc7cb2dd05e1f33728f767 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Mon, 27 Feb 2017 13:05:26 +0900
Subject: Always keep block argument space in stack; fix #3469

---
 src/vm.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/vm.c')

diff --git a/src/vm.c b/src/vm.c
index 96a9966a2..e9a34b73d 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1162,14 +1162,12 @@ RETRY_TRY_BLOCK:
       }
       if (GET_OPCODE(i) != OP_SENDB) {
         SET_NIL_VALUE(regs[bidx]);
-        bidx = 0;
       }
       else {
         mrb_value blk = regs[bidx];
         if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
           regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
         }
-        bidx = 1;
       }
       c = mrb_class(mrb, recv);
       m = mrb_method_search_vm(mrb, &c, mid);
@@ -1198,7 +1196,7 @@ RETRY_TRY_BLOCK:
           mrb_ary_unshift(mrb, regs[a+1], sym);
         }
         else {
-          value_move(regs+a+2, regs+a+1, n+bidx);
+          value_move(regs+a+2, regs+a+1, n+1);
           regs[a+1] = sym;
           n++;
         }
-- 
cgit v1.2.3