Skip to content

Commit

Permalink
Revert 642ab8e; ref #3422
Browse files Browse the repository at this point in the history
Also fix #3499.  The issue was solved by #3462.
  • Loading branch information
matz committed Mar 11, 2017
1 parent 94395e8 commit 4ab7029
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/vm.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ ecall(mrb_state *mrb, int i)
mrb_value *self = mrb->c->stack;
struct RObject *exc;
int cioff;
ptrdiff_t nstk;

if (i<0) return;
if (mrb->c->ci - mrb->c->cibase > MRB_FUNCALL_DEPTH_MAX) {
Expand All @@ -301,7 +300,6 @@ ecall(mrb_state *mrb, int i)
mrb->c->ci->eidx = i;
cioff = mrb->c->ci - mrb->c->cibase;
ci = cipush(mrb);
nstk = ci->stackent - mrb->c->stbase;
ci->stackent = mrb->c->stack;
ci->mid = ci[-1].mid;
ci->acc = CI_ACC_SKIP;
Expand All @@ -313,7 +311,6 @@ ecall(mrb_state *mrb, int i)
exc = mrb->exc; mrb->exc = 0;
mrb_run(mrb, p, *self);
mrb->c->ensure[i] = NULL;
ci->stackent = mrb->c->stbase + nstk;
mrb->c->ci = mrb->c->cibase + cioff;
if (!mrb->exc) mrb->exc = exc;
}
Expand Down

2 comments on commit 4ab7029

@dkasak
Copy link

@dkasak dkasak commented on 4ab7029 Mar 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small correction if anyone is reading this: you probably meant ref #3442. Also, the previous issue is presumably solved in commit b563bcb which closed #3462.

@matz
Copy link
Member Author

@matz matz commented on 4ab7029 Mar 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. It was my mistake and have already committed to GitHub before I noticed.

Please sign in to comment.