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

Bovi-Li · Sep 23, 2012 · 3fb943e · 3fb943e
2 parents f699d8e + 84008f9
commit 3fb943e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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 */