From 2dcbabf0999b8bab43e6b397ffeb3721ccf282ef Mon Sep 17 00:00:00 2001 From: Vlad Brezae Date: Sat, 8 Apr 2023 00:10:49 +0300 Subject: [PATCH] [mono][sgen] Remove more dead code (#84476) --- src/mono/mono/sgen/sgen-gc.c | 6 ------ src/mono/mono/sgen/sgen-gc.h | 2 -- src/mono/mono/sgen/sgen-marksweep.c | 14 -------------- 3 files changed, 22 deletions(-) diff --git a/src/mono/mono/sgen/sgen-gc.c b/src/mono/mono/sgen/sgen-gc.c index 56b6e370b748d..bef4573e36166 100644 --- a/src/mono/mono/sgen/sgen-gc.c +++ b/src/mono/mono/sgen/sgen-gc.c @@ -3928,12 +3928,6 @@ sgen_gc_unlock (void) mono_coop_mutex_unlock (&sgen_gc_mutex); } -void -sgen_major_collector_iterate_live_block_ranges (sgen_cardtable_block_callback callback) -{ - sgen_major_collector.iterate_live_block_ranges (callback); -} - void sgen_major_collector_iterate_block_ranges (sgen_cardtable_block_callback callback) { diff --git a/src/mono/mono/sgen/sgen-gc.h b/src/mono/mono/sgen/sgen-gc.h index 2e59db54be1c4..5578c25d6ea6e 100644 --- a/src/mono/mono/sgen/sgen-gc.h +++ b/src/mono/mono/sgen/sgen-gc.h @@ -641,7 +641,6 @@ sgen_update_reference (GCObject **p, GCObject *o, gboolean allow_null) /* Major collector */ typedef void (*sgen_cardtable_block_callback) (mword start, mword size); -void sgen_major_collector_iterate_live_block_ranges (sgen_cardtable_block_callback callback); void sgen_major_collector_iterate_block_ranges (sgen_cardtable_block_callback callback); void sgen_iterate_all_block_ranges (sgen_cardtable_block_callback callback, gboolean is_parallel); @@ -698,7 +697,6 @@ struct _SgenMajorCollector { void (*pin_objects) (SgenGrayQueue *queue); void (*pin_major_object) (GCObject *obj, SgenGrayQueue *queue); void (*scan_card_table) (CardTableScanType scan_type, ScanCopyContext ctx, int job_index, int job_split_count, int block_count); - void (*iterate_live_block_ranges) (sgen_cardtable_block_callback callback); void (*iterate_block_ranges) (sgen_cardtable_block_callback callback); void (*iterate_block_ranges_in_parallel) (sgen_cardtable_block_callback callback, int job_index, int job_split_count, int block_count); void (*update_cardtable_mod_union) (void); diff --git a/src/mono/mono/sgen/sgen-marksweep.c b/src/mono/mono/sgen/sgen-marksweep.c index 26529dddc116a..482f534326ab3 100644 --- a/src/mono/mono/sgen/sgen-marksweep.c +++ b/src/mono/mono/sgen/sgen-marksweep.c @@ -2433,19 +2433,6 @@ major_iterate_block_ranges_in_parallel (sgen_cardtable_block_callback callback, } END_FOREACH_BLOCK_RANGE_NO_LOCK; } -static void -major_iterate_live_block_ranges (sgen_cardtable_block_callback callback) -{ - MSBlockInfo *block; - gboolean has_references; - - major_finish_sweep_checking (); - FOREACH_BLOCK_HAS_REFERENCES_NO_LOCK (block, has_references) { - if (has_references) - callback ((mword)MS_BLOCK_FOR_BLOCK_INFO (block), ms_block_size); - } END_FOREACH_BLOCK_NO_LOCK; -} - #ifdef HEAVY_STATISTICS extern guint64 marked_cards; extern guint64 scanned_cards; @@ -2878,7 +2865,6 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr collector->pin_objects = major_pin_objects; collector->pin_major_object = pin_major_object; collector->scan_card_table = major_scan_card_table; - collector->iterate_live_block_ranges = major_iterate_live_block_ranges; collector->iterate_block_ranges = major_iterate_block_ranges; collector->iterate_block_ranges_in_parallel = major_iterate_block_ranges_in_parallel; #ifndef DISABLE_SGEN_MAJOR_MARKSWEEP_CONC