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

Avoid crossing C function boundary from OP_EPOP; ref #3789

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-09-05 21:12:36 +09:00
parent 7f4b57bb20
commit f68f5f6b97
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+23 -7
View File
@@ -1319,14 +1319,30 @@ RETRY_TRY_BLOCK:
CASE(OP_EPOP) {
/* A A.times{ensure_pop().call} */
int a = GETARG_A(i);
mrb_callinfo *ci = mrb->c->ci;
int n, epos = ci->epos;
mrb_callinfo *ci, *nci;
mrb_value self = regs[0];
for (n=0; n<a && mrb->c->eidx > epos; n++) {
ecall(mrb, --mrb->c->eidx);
mrb_gc_arena_restore(mrb, ai);
}
NEXT;
/* temporary limitation */
mrb_assert(a==1);
proc = mrb->c->ensure[--mrb->c->eidx];
ci = mrb->c->ci;
nci = cipush(mrb);
nci->mid = ci->mid;
nci->argc = 0;
nci->proc = proc;
nci->stackent = mrb->c->stack;
nci->nregs = irep->nregs;
nci->target_class = proc->target_class;
nci->pc = pc + 1;
nci->acc = nci->nregs;
mrb->c->stack += ci->nregs;
stack_extend(mrb, nci->nregs);
irep = proc->body.irep;
pool = irep->pool;
syms = irep->syms;
regs[0] = self;
pc = irep->iseq;
JUMP;
}
CASE(OP_LOADNIL) {