2 files changed, 8 insertions, 2 deletions
diff --git a/src/gc.c b/src/gc.c
index 19bc1ad4b..db70587d5 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -545,10 +545,16 @@ mark_context_stack(mrb_state *mrb, struct mrb_context *c)
   size_t i;
   size_t e;
   mrb_value nil;
+  int nregs;
 
   if (c->stack == NULL) return;
   e = c->stack - c->stbase;
-  if (c->ci) e += c->ci->nregs;
+  if (c->ci) {
+    nregs = c->ci->argc + 2;
+    if (c->ci->nregs > nregs)
+      nregs = c->ci->nregs;
+    e += nregs;
+  }
   if (c->stbase + e > c->stend) e = c->stend - c->stbase;
   for (i=0; i<e; i++) {
     mrb_value v = c->stbase[i];
diff --git a/src/vm.c b/src/vm.c
index 1b967ef7e..0a99e5f41 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1589,7 +1589,6 @@ RETRY_TRY_BLOCK:
         argc = mrb_ary_ptr(argv[0])->len;
         argv = mrb_ary_ptr(argv[0])->ptr;
       }
-      mrb->c->ci->argc = len;
       if (argc < len) {
         int mlen = m2;
         if (argc < m1+m2) {
@@ -1639,6 +1638,7 @@ RETRY_TRY_BLOCK:
         }
         pc += o + 1;
       }
+      mrb->c->ci->argc = len;
       /* clear local (but non-argument) variables */
       if (irep->nlocals-len-2 > 0) {
         stack_clear(&regs[len+2], irep->nlocals-len-2);