From ebdb3a608d9a43ef6fd3305b18ce969617397f76 Mon Sep 17 00:00:00 2001
From: Mark Probst <mark.probst@gmail.com>
Date: Wed, 25 Mar 2015 16:27:50 -0700
Subject: [PATCH] [sgen] Remove dead code and data and make things static.

---
 mono/metadata/sgen-debug.c             |  2 +-
 mono/metadata/sgen-gc.c                | 20 ++------------------
 mono/metadata/sgen-gray.c              |  2 +-
 mono/metadata/sgen-mono.c              |  6 ++++++
 mono/metadata/sgen-nursery-allocator.c |  2 +-
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/mono/metadata/sgen-debug.c b/mono/metadata/sgen-debug.c
index 1c131ecd611..8aa24a301ee 100644
--- a/mono/metadata/sgen-debug.c
+++ b/mono/metadata/sgen-debug.c
@@ -54,7 +54,7 @@ void check_object (char *start);
  * ######################################################################
  */
 
-const char*descriptor_types [] = {
+static const char*descriptor_types [] = {
 	"INVALID",
 	"run length",
 	"bitmap",
diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index af7200209e9..d0674a271df 100644
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -271,7 +271,6 @@ guint64 stat_nursery_copy_object_failed_pinned = 0;
 guint64 stat_nursery_copy_object_failed_to_space = 0;
 
 static guint64 stat_wbarrier_add_to_global_remset = 0;
-static guint64 stat_wbarrier_set_field = 0;
 static guint64 stat_wbarrier_set_arrayref = 0;
 static guint64 stat_wbarrier_arrayref_copy = 0;
 static guint64 stat_wbarrier_generic_store = 0;
@@ -325,7 +324,7 @@ mono_gc_flush_info (void)
 #define TV_GETTIME SGEN_TV_GETTIME
 #define TV_ELAPSED SGEN_TV_ELAPSED
 
-SGEN_TV_DECLARE (sgen_init_timestamp);
+static SGEN_TV_DECLARE (sgen_init_timestamp);
 
 NurseryClearPolicy nursery_clear_policy = CLEAR_AT_TLAB_CREATION;
 
@@ -366,7 +365,7 @@ static volatile mword highest_heap_address = 0;
 LOCK_DECLARE (sgen_interruption_mutex);
 
 int current_collection_generation = -1;
-volatile gboolean concurrent_collection_in_progress = FALSE;
+static volatile gboolean concurrent_collection_in_progress = FALSE;
 
 /* objects that are ready to be finalized */
 static SgenPointerQueue fin_ready_queue = SGEN_POINTER_QUEUE_INIT (INTERNAL_MEM_FINALIZE_READY);
@@ -1295,7 +1294,6 @@ init_stats (void)
 
 #ifdef HEAVY_STATISTICS
 	mono_counters_register ("WBarrier remember pointer", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_wbarrier_add_to_global_remset);
-	mono_counters_register ("WBarrier set field", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_wbarrier_set_field);
 	mono_counters_register ("WBarrier set arrayref", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_wbarrier_set_arrayref);
 	mono_counters_register ("WBarrier arrayref copy", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_wbarrier_arrayref_copy);
 	mono_counters_register ("WBarrier generic store called", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_wbarrier_generic_store);
@@ -2705,20 +2703,6 @@ sgen_thread_unregister (SgenThreadInfo *p)
  * itself. If a GC interrupts the barrier in the middle, value will be kept alive by
  * the conservative scan, otherwise by the remembered set scan.
  */
-void
-mono_gc_wbarrier_set_field (GCObject *obj, gpointer field_ptr, GCObject* value)
-{
-	HEAVY_STAT (++stat_wbarrier_set_field);
-	if (ptr_in_nursery (field_ptr)) {
-		*(void**)field_ptr = value;
-		return;
-	}
-	SGEN_LOG (8, "Adding remset at %p", field_ptr);
-	if (value)
-		binary_protocol_wbarrier (field_ptr, value, value->vtable);
-
-	remset.wbarrier_set_field (obj, field_ptr, value);
-}
 
 void
 mono_gc_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int count)
diff --git a/mono/metadata/sgen-gray.c b/mono/metadata/sgen-gray.c
index 4dfca503335..6fec9394925 100644
--- a/mono/metadata/sgen-gray.c
+++ b/mono/metadata/sgen-gray.c
@@ -246,7 +246,7 @@ invalid_prepare_func (SgenGrayQueue *queue)
 void
 sgen_gray_object_queue_init_invalid (SgenGrayQueue *queue)
 {
-	sgen_gray_object_queue_init (queue, FALSE);
+	sgen_gray_object_queue_init (queue, NULL);
 	queue->alloc_prepare_func = invalid_prepare_func;
 	queue->alloc_prepare_data = NULL;
 }
diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c
index 99f8b7ae514..c453bcc332b 100644
--- a/mono/metadata/sgen-mono.c
+++ b/mono/metadata/sgen-mono.c
@@ -168,6 +168,12 @@ mono_gc_wbarrier_set_arrayref (MonoArray *arr, gpointer slot_ptr, MonoObject* va
 	sgen_get_remset ()->wbarrier_set_field ((GCObject*)arr, slot_ptr, value);
 }
 
+void
+mono_gc_wbarrier_set_field (MonoObject *obj, gpointer field_ptr, MonoObject* value)
+{
+	mono_gc_wbarrier_set_arrayref ((MonoArray*)obj, field_ptr, value);
+}
+
 void
 mono_gc_wbarrier_value_copy_bitmap (gpointer _dest, gpointer _src, int size, unsigned bitmap)
 {
diff --git a/mono/metadata/sgen-nursery-allocator.c b/mono/metadata/sgen-nursery-allocator.c
index d7b67e373ed..adcce0f9dcd 100644
--- a/mono/metadata/sgen-nursery-allocator.c
+++ b/mono/metadata/sgen-nursery-allocator.c
@@ -71,7 +71,7 @@
 //#define NALLOC_DEBUG 1
 
 /* The mutator allocs from here. */
-SgenFragmentAllocator mutator_allocator;
+static SgenFragmentAllocator mutator_allocator;
 
 /* freeelist of fragment structures */
 static SgenFragment *fragment_freelist = NULL;
-- 
2.25.1