summaryrefslogtreecommitdiffhomepage
path: root/src/vm.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-03-01 12:06:18 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-03-01 12:06:18 +0900
commiteca35df4ff59230f48f5ca0da1d6de2f65ec1b4c (patch)
tree3db529e928df2bec52079dd41c443e133743283b /src/vm.c
parent8b089c09f7ddaa513d14c84a04e050abc17b01b3 (diff)
downloadmruby-eca35df4ff59230f48f5ca0da1d6de2f65ec1b4c.tar.gz
mruby-eca35df4ff59230f48f5ca0da1d6de2f65ec1b4c.zip
`ci` may be moved during `mrb_convert_type()`; ref #3474
Diffstat (limited to 'src/vm.c')
-rw-r--r--src/vm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/vm.c b/src/vm.c
index 043983a05..458968524 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1387,6 +1387,8 @@ RETRY_TRY_BLOCK:
ci->mid = mid;
ci->proc = m;
ci->stackent = mrb->c->stack;
+ ci->target_class = c;
+ ci->pc = pc + 1;
{
int bidx;
mrb_value blk;
@@ -1402,10 +1404,9 @@ RETRY_TRY_BLOCK:
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
+ ci = mrb->c->ci;
}
}
- ci->target_class = c;
- ci->pc = pc + 1;
/* prepare stack */
mrb->c->stack += a;