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

should call ensure before popping callinfo; cancel 8ce1ea84

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-04-22 11:49:10 +09:00
parent e889cddf78
commit c633f32b41
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+5 -10
View File
@@ -811,7 +811,8 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
int a = GETARG_A(i);
for (n=0; n<a; n++) {
ecall(mrb, --mrb->ci->eidx);
ecall(mrb, mrb->ci->eidx-1);
--mrb->ci->eidx;
}
mrb_gc_arena_restore(mrb, ai);
NEXT;
@@ -1283,19 +1284,13 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
/* cannot happen */
break;
}
while (eidx > mrb->ci[-1].eidx) {
ecall(mrb, --eidx);
}
cipop(mrb);
acc = ci->acc;
pc = ci->pc;
regs = mrb->stack = mrb->stbase + ci->stackidx;
{
int idx = eidx;
while (idx > mrb->ci->eidx) {
mrb_gc_protect(mrb, mrb_obj_value(mrb->ensure[--idx]));
}
}
while (eidx > mrb->ci->eidx) {
ecall(mrb, --eidx);
}
if (acc < 0) {
mrb->jmp = prev_jmp;
return v;