Skip to content

M
mruby
Commit 4ab70294 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Revert 642ab8ec; ref #3422 

Also fix #3499.  The issue was solved by #3462.
parent 94395e81
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
src/vm.c
View file @ 4ab70294
...@@ -289,7 +289,6 @@ ecall(mrb_state *mrb, int i) ...@@ -289,7 +289,6 @@ ecall(mrb_state *mrb, int i)
mrb_value *self = mrb->c->stack; mrb_value *self = mrb->c->stack;
struct RObject *exc; struct RObject *exc;
int cioff; int cioff;
ptrdiff_t nstk;
if (i<0) return; if (i<0) return;
if (mrb->c->ci - mrb->c->cibase > MRB_FUNCALL_DEPTH_MAX) { if (mrb->c->ci - mrb->c->cibase > MRB_FUNCALL_DEPTH_MAX) {
...@@ -301,7 +300,6 @@ ecall(mrb_state *mrb, int i) ...@@ -301,7 +300,6 @@ ecall(mrb_state *mrb, int i)
mrb->c->ci->eidx = i; mrb->c->ci->eidx = i;
cioff = mrb->c->ci - mrb->c->cibase; cioff = mrb->c->ci - mrb->c->cibase;
ci = cipush(mrb); ci = cipush(mrb);
nstk = ci->stackent - mrb->c->stbase;
ci->stackent = mrb->c->stack; ci->stackent = mrb->c->stack;
ci->mid = ci[-1].mid; ci->mid = ci[-1].mid;
ci->acc = CI_ACC_SKIP; ci->acc = CI_ACC_SKIP;
...@@ -313,7 +311,6 @@ ecall(mrb_state *mrb, int i) ...@@ -313,7 +311,6 @@ ecall(mrb_state *mrb, int i)
exc = mrb->exc; mrb->exc = 0; exc = mrb->exc; mrb->exc = 0;
mrb_run(mrb, p, *self); mrb_run(mrb, p, *self);
mrb->c->ensure[i] = NULL; mrb->c->ensure[i] = NULL;
ci->stackent = mrb->c->stbase + nstk;
mrb->c->ci = mrb->c->cibase + cioff; mrb->c->ci = mrb->c->cibase + cioff;
if (!mrb->exc) mrb->exc = exc; if (!mrb->exc) mrb->exc = exc;
} }
......
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