diff options
| author | Peter Zhu <peter.zhu@shopify.com> | 2021-08-10 19:54:10 -0400 |
|---|---|---|
| committer | Peter Zhu <peter@peterzhu.ca> | 2021-08-11 09:26:19 -0400 |
| commit | 79cc566ab4cdf75f125ecf413a27d353a9756c08 (patch) | |
| tree | 9e524924e295d274adaa0ffd8b3a930c6ef77f5e /gc.c | |
| parent | c06b39d1d1f050ad6e202e9847c3a21894505766 (diff) | |
Make during_compacting flag in GC one bit
Commit c32218de1ba094223420a4ea017707f48d0009c5 turned during_compacting
flag to 2 bits to support the case when there is no write barrier. But
commit 32b7dcfb56a417c1d1c354102351fc1825d653bf changed compaction to
always enable the write barrier. This commit cleans up some of the
leftover code.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4730
Diffstat (limited to 'gc.c')
| -rw-r--r-- | gc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -715,7 +715,7 @@ typedef struct rb_objspace { unsigned int dont_gc : 1; unsigned int dont_incremental : 1; unsigned int during_gc : 1; - unsigned int during_compacting : 2; + unsigned int during_compacting : 1; unsigned int gc_stressful: 1; unsigned int has_hook: 1; unsigned int during_minor_gc : 1; @@ -8915,7 +8915,7 @@ gc_start(rb_objspace_t *objspace, unsigned int reason) objspace->flags.immediate_sweep = !!(reason & GPR_FLAG_IMMEDIATE_SWEEP); /* Explicitly enable compaction (GC.compact) */ - objspace->flags.during_compacting = (!!(reason & GPR_FLAG_COMPACT) << 1); + objspace->flags.during_compacting = !!(reason & GPR_FLAG_COMPACT); if (!heap_allocated_pages) return FALSE; /* heap is not ready */ if (!(reason & GPR_FLAG_METHOD) && !ready_to_gc(objspace)) return TRUE; /* GC is not allowed */ |