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

Removed unneeded ci->nregs checks in OP_SEND and OP_SUPER

Browse Source 
Because of #3504 `ci->nregs = bidx+1` was introduced in b64f08784c.
This led to the follow up error #3551 whose fix introduced the `if (bidx >= ci->nregs)`
check in 071164b799 and the `stack_extend(mrb, ci->nregs)`
in 93d802987e.

Then, the code causing #3504 reappeared again in #3590. The fix for it moved the code
dealing with the block in OP_SUPER from below the `cipush`  to above the `cipush`
in d9fb8b69b0. The `if (bidx >= ci->nregs) { ... }` from
then on works with the original callinfo and not the pushed one. `ci->nregs` needed to
be modified for the pushed one because it is initialized to 0. But for the original ci
it is propertly set and a check is not needed.
This commit is contained in:
Christopher Aue
2017-08-12 23:27:17 +02:00
parent f2d4640998
commit 198df61039
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
-12
View File
@@ -1339,20 +1339,12 @@ RETRY_TRY_BLOCK:
recv = regs[a];
if (GET_OPCODE(i) != OP_SENDB) {
if (bidx >= ci->nregs) {
ci->nregs = bidx+1;
stack_extend(mrb, ci->nregs);
}
SET_NIL_VALUE(regs[bidx]);
blk = regs[bidx];
}
else {
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
if (bidx >= ci->nregs) {
ci->nregs = bidx+1;
stack_extend(mrb, ci->nregs);
}
blk = regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
}
}
@@ -1536,10 +1528,6 @@ RETRY_TRY_BLOCK:
recv = regs[0];
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
if (bidx >= ci->nregs) {
ci->nregs = bidx+1;
stack_extend(mrb, ci->nregs);
}
blk = regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
}
c = ci->target_class->super;