From d304f77c585c42a2e8b008d170ac153b7d8e5243 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 19 Jul 2019 15:12:02 -0700 Subject: Only disable GC around reference updating This is the only place that can change the size of the object id tables and cause a GC. --- gc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index df48bc1269..1c2959cbad 100644 --- a/gc.c +++ b/gc.c @@ -8215,9 +8215,7 @@ gc_compact(rb_objspace_t *objspace, int use_toward_empty, int use_double_pages, /* pin objects referenced by maybe pointers */ rb_gc(); /* compact */ - rb_gc_disable(); gc_compact_after_gc(objspace, use_toward_empty, use_double_pages, TRUE); - rb_gc_enable(); } objspace->flags.during_compacting = FALSE; return gc_compact_stats(objspace); @@ -8312,7 +8310,10 @@ gc_compact_after_gc(rb_objspace_t *objspace, int use_toward_empty, int use_doubl moved_list = gc_compact_heap(objspace, compare_pinned); } heap_eden->freelist = NULL; + + VALUE disabled = rb_gc_disable(); gc_update_references(objspace); + if (!RTEST(disabled)) rb_gc_enable(); if (use_verifier) { gc_check_references_for_moved(Qnil); -- cgit v1.2.3