2 files changed, 6 insertions, 1 deletions
diff --git a/src/codegen.c b/src/codegen.c
index 963e94b21..3236713e2 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -2149,6 +2149,11 @@ codedump(mrb_state *mrb, int n)
              mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
              GETARG_C(c));
       break;
+    case OP_TAILCALL:
+      printf("OP_TAILCALL\tR%d\t:%s\t%d\n", GETARG_A(c),
+             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
+             GETARG_C(c));
+      break;
     case OP_SUPER:
       printf("OP_SUPER\tR%d\t%d\n", GETARG_A(c),
              GETARG_C(c));
diff --git a/src/vm.c b/src/vm.c
index d69081c9c..62fba24d0 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1120,7 +1120,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
 
 
       /* replace callinfo */
-      mrb->ci = ci = &mrb->ci[-1];
+      ci = mrb->ci;
       ci->mid = mid;
       ci->target_class = m->target_class;
       ci->argc = n;