summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-01-04 00:07:34 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-01-04 00:07:34 +0900
commitd32a67e4b4699acd54f5cfc8eb872f0c60b4938c (patch)
tree0f8141fe653650a8dbf675a4e4638fa89165d197 /src
parent6d7b3a7bc9e85d07a9df156593b291c0122f58a4 (diff)
parent0bafa49d904e60804e1799b69aa17c49cfa6e661 (diff)
downloadmruby-d32a67e4b4699acd54f5cfc8eb872f0c60b4938c.tar.gz
mruby-d32a67e4b4699acd54f5cfc8eb872f0c60b4938c.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src')
-rw-r--r--src/vm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm.c b/src/vm.c
index 60933d8f3..c9f6d335e 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -601,7 +601,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
stack_init(mrb);
}
stack_extend(mrb, irep->nregs, stack_keep);
- mrb->c->ci->err = pc;
+ ERR_PC_SET(mrb, pc);
mrb->c->ci->proc = proc;
mrb->c->ci->nregs = irep->nregs + 1;
regs = mrb->c->stack;
@@ -2130,7 +2130,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
ecall(mrb, n);
}
}
- mrb->c->ci->err = 0;
+ ERR_PC_CLR(mrb);
mrb->jmp = prev_jmp;
if (mrb->exc) {
return mrb_obj_value(mrb->exc);