diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-03-01 12:06:18 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-03-01 12:06:18 +0900 |
| commit | eca35df4ff59230f48f5ca0da1d6de2f65ec1b4c (patch) | |
| tree | 3db529e928df2bec52079dd41c443e133743283b | |
| parent | 8b089c09f7ddaa513d14c84a04e050abc17b01b3 (diff) | |
| download | mruby-eca35df4ff59230f48f5ca0da1d6de2f65ec1b4c.tar.gz mruby-eca35df4ff59230f48f5ca0da1d6de2f65ec1b4c.zip | |
`ci` may be moved during `mrb_convert_type()`; ref #3474
| -rw-r--r-- | src/vm.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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; |
