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

Reintroduced not storing converted proc directly in the stack

Browse Source
This commit is contained in:
Christopher Aue
2017-08-12 23:59:35 +02:00
parent 198df61039
commit d5ac785b31
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+8 -2
View File
@@ -1345,7 +1345,10 @@ RETRY_TRY_BLOCK:
else {
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
blk = regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
/* store the converted proc not directly in the stack because the stack
might have been reallocated during mrb_convert_type(), see #3622 */
blk = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
regs[bidx] = blk;
}
}
c = mrb_class(mrb, recv);
@@ -1528,7 +1531,10 @@ RETRY_TRY_BLOCK:
recv = regs[0];
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
blk = regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
/* store the converted proc not directly in the stack because the stack
might have been reallocated during mrb_convert_type(), see #3622 */
blk = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
regs[bidx] = blk;
}
c = ci->target_class->super;
m = mrb_method_search_vm(mrb, &c, mid);