mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Make during_compacting flag in GC one bit
Commitc32218de1b
turned during_compacting flag to 2 bits to support the case when there is no write barrier. But commit32b7dcfb56
changed compaction to always enable the write barrier. This commit cleans up some of the leftover code.
This commit is contained in:
parent
c06b39d1d1
commit
79cc566ab4
Notes:
git
2021-08-11 22:26:46 +09:00
1 changed files with 2 additions and 2 deletions
4
gc.c
4
gc.c
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue