Permalink
Browse files

Revert 642ab8e; ref #3422

Also fix #3499.  The issue was solved by #3462.
  • Loading branch information...
matz committed Mar 11, 2017
1 parent 94395e8 commit 4ab70294ea01cbaf6bdbfbea5bbd854f6661cfd8
Showing with 0 additions and 3 deletions.
  1. +0 −3 src/vm.c
View
@@ -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) {
@@ -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;
@@ -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;
}

2 comments on commit 4ab7029

@dkasak

This comment has been minimized.

Show comment
Hide comment
@dkasak

dkasak Mar 11, 2017

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.

dkasak replied Mar 11, 2017

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

This comment has been minimized.

Show comment
Hide comment
@matz

matz Mar 12, 2017

Member

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

Member

matz replied Mar 12, 2017

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

Please sign in to comment.