From eca35df4ff59230f48f5ca0da1d6de2f65ec1b4c Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Wed, 1 Mar 2017 12:06:18 +0900
Subject: `ci` may be moved during `mrb_convert_type()`; ref #3474

---
 src/vm.c | 5 +++--
 1 file 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;
-- 
cgit v1.2.3