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

OP_CALL for cfunc must restore callinfo; close #476

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-09-20 18:26:51 +09:00
parent 4bf51cdd42
commit 44b28a83f8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+6 -1
View File
@@ -843,12 +843,17 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
/* prepare stack */
if (MRB_PROC_CFUNC_P(m)) {
mrb->stack[0] = m->body.func(mrb, recv);
recv = m->body.func(mrb, recv);
mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE;
/* pop stackpos */
regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
regs[mrb->ci->acc] = recv;
cipop(mrb);
irep = mrb->ci->proc->body.irep;
pool = irep->pool;
syms = irep->syms;
pc = mrb->ci->pc;
NEXT;
}
else {