From 8e5d89df7f7ef827bc410f331c20da57c5bd3c72 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Sun, 10 Oct 2021 16:20:07 +0900
Subject: vm.c: unify `mrb_gc_arena_restore` and `mrb_gc_arena_shrink`.

---
 src/vm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/vm.c b/src/vm.c
index e675b594e..7c69b9c3b 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -64,6 +64,7 @@ mrb_gc_arena_shrink(mrb_state *mrb, int idx)
   mrb_gc *gc = &mrb->gc;
   int capa = gc->arena_capa;
 
+  mrb->gc.arena_idx = idx;
   if (idx < capa / 4) {
     capa >>= 2;
     if (capa < MRB_GC_ARENA_SIZE) {
@@ -76,7 +77,7 @@ mrb_gc_arena_shrink(mrb_state *mrb, int idx)
   }
 }
 #else
-#define mrb_gc_arena_shrink(mrb,idx)
+#define mrb_gc_arena_shrink(mrb,idx) mrb_gc_arena_restore(mrb,idx)
 #endif
 
 #define CALL_MAXARGS 127
@@ -1544,7 +1545,6 @@ RETRY_TRY_BLOCK:
         else {
           recv = MRB_METHOD_FUNC(m)(mrb, recv);
         }
-        mrb_gc_arena_restore(mrb, ai);
         mrb_gc_arena_shrink(mrb, ai);
         if (mrb->exc) goto L_RAISE;
         ci = mrb->c->ci;
@@ -1600,7 +1600,6 @@ RETRY_TRY_BLOCK:
       /* prepare stack */
       if (MRB_PROC_CFUNC_P(m)) {
         recv = MRB_PROC_CFUNC(m)(mrb, recv);
-        mrb_gc_arena_restore(mrb, ai);
         mrb_gc_arena_shrink(mrb, ai);
         if (mrb->exc) goto L_RAISE;
         /* pop stackpos */
-- 
cgit v1.2.3