Merge remote-tracking branch 'upstream/master' into mrbgems

1 files changed, 5 insertions, 4 deletions

diff --git a/src/vm.c b/src/vm.c
index 97c14e7aa..ce77f5b05 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -847,14 +847,15 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
         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;
+	ci = mrb->ci;
+        regs = mrb->stack = mrb->stbase + ci->stackidx;
+	regs[ci->acc] = recv;
+	pc = ci->pc;
         cipop(mrb);
         irep = mrb->ci->proc->body.irep;
         pool = irep->pool;
         syms = irep->syms;
-	pc = mrb->ci->pc;
-        NEXT;
+        JUMP;
       }
       else {
         /* setup environment for calling method */