Skip to content

M
mruby
Commit 345ba3a6 authored by Masamitsu MURASE's avatar Masamitsu MURASE
Browse files
Options

Refer to mrb->ci instead of local variable `ci` after m->body.func is called, 

because mrb->ci may be changed in m->body.func.
parent 72bc9c8e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/vm.c
View file @ 345ba3a6
...@@ -287,7 +287,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr ...@@ -287,7 +287,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
val = p->body.func(mrb, self); val = p->body.func(mrb, self);
mrb->arena_idx = ai; mrb->arena_idx = ai;
mrb_gc_protect(mrb, val); mrb_gc_protect(mrb, val);
mrb->stack = mrb->stbase + ci->stackidx; mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb); cipop(mrb);
} }
else { else {
...@@ -331,7 +331,7 @@ mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_v ...@@ -331,7 +331,7 @@ mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_v
if (MRB_PROC_CFUNC_P(p)) { if (MRB_PROC_CFUNC_P(p)) {
val = p->body.func(mrb, self); val = p->body.func(mrb, self);
mrb->stack = mrb->stbase + ci->stackidx; mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb); cipop(mrb);
} }
else { else {
...@@ -772,7 +772,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) ...@@ -772,7 +772,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
mrb->arena_idx = ai; mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE; if (mrb->exc) goto L_RAISE;
/* pop stackpos */ /* pop stackpos */
regs = mrb->stack = mrb->stbase + ci->stackidx; regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb); cipop(mrb);
NEXT; NEXT;
} }
...@@ -830,7 +830,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) ...@@ -830,7 +830,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
mrb->arena_idx = ai; mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE; if (mrb->exc) goto L_RAISE;
/* pop stackpos */ /* pop stackpos */
regs = mrb->stack = mrb->stbase + ci->stackidx; regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb); cipop(mrb);
NEXT; NEXT;
} }
...@@ -903,7 +903,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) ...@@ -903,7 +903,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
mrb->arena_idx = ai; mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE; if (mrb->exc) goto L_RAISE;
/* pop stackpos */ /* pop stackpos */
regs = mrb->stack = mrb->stbase + ci->stackidx; regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb); cipop(mrb);
NEXT; NEXT;
} }
...@@ -1619,7 +1619,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) ...@@ -1619,7 +1619,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
mrb->arena_idx = ai; mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE; if (mrb->exc) goto L_RAISE;
/* pop stackpos */ /* pop stackpos */
regs = mrb->stack = mrb->stbase + ci->stackidx; regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb); cipop(mrb);
NEXT; NEXT;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment