summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-02-27 13:05:26 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-02-27 13:05:26 +0900
commit736be0e98b9e1136a4dc7cb2dd05e1f33728f767 (patch)
tree97e756641e8c01ea7cee375ce7022ca0bdf492fd
parent83a6c0e0a4eddd1980a0e41c0554b4c33ecbe7c4 (diff)
downloadmruby-736be0e98b9e1136a4dc7cb2dd05e1f33728f767.tar.gz
mruby-736be0e98b9e1136a4dc7cb2dd05e1f33728f767.zip
Always keep block argument space in stack; fix #3469
-rw-r--r--src/vm.c4
1 files changed, 1 insertions, 3 deletions
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++;
}