admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in OP_SUPER block conversion; fix #3590

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-04-05 18:22:26 +09:00
parent bd7bf260e8
commit d9fb8b69b0
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+22 -21
View File
@@ -1375,6 +1375,8 @@ RETRY_TRY_BLOCK:
mrb_sym mid = ci->mid;
int a = GETARG_A(i);
int n = GETARG_C(i);
mrb_value blk;
int bidx;
if (mid == 0 || !ci->target_class) {
mrb_value exc;
@@ -1414,6 +1416,21 @@ RETRY_TRY_BLOCK:
}
}
if (n == CALL_MAXARGS) {
bidx = a+2;
}
else {
bidx = a+n+1;
}
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
if (bidx >= ci->nregs) {
stack_extend(mrb, bidx+1, ci->nregs);
ci->nregs = bidx+1;
}
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
}
/* push callinfo */
ci = cipush(mrb);
ci->mid = mid;
@@ -1421,27 +1438,11 @@ RETRY_TRY_BLOCK:
ci->stackent = mrb->c->stack;
ci->target_class = c;
ci->pc = pc + 1;
{
int bidx;
mrb_value blk;
if (n == CALL_MAXARGS) {
ci->argc = -1;
bidx = a+2;
}
else {
ci->argc = n;
bidx = a+n+1;
}
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
if (bidx >= ci->nregs) {
stack_extend(mrb, bidx+1, ci->nregs);
ci->nregs = bidx+1;
}
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
ci = mrb->c->ci;
}
if (n == CALL_MAXARGS) {
ci->argc = -1;
}
else {
ci->argc = n;
}
/* prepare stack */