Skip to content

M
mruby
Unverified Commit 8e5d89df authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

vm.c: unify `mrb_gc_arena_restore` and `mrb_gc_arena_shrink`.

parent 5cdf1eab
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
src/vm.c
View file @ 8e5d89df
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment