Add several write barriers needed to comply with strict wbarrier mode

Author: jechter

mono/metadata/appdomain.c

@@ -198,13 +198,15 @@ create_domain_objects (MonoDomain *domain)
 	mono_error_assert_ok (&error);
 	mono_field_static_set_value (string_vt, string_empty_fld, empty_str);
 	domain->empty_string = empty_str;
+	mono_gc_wbarrier_generic_nostore (&domain->empty_string);
 
 	/*
 	 * Create an instance early since we can't do it when there is no memory.
 	 */
 	arg = mono_string_new_checked (domain, "Out of memory", &error);
 	mono_error_assert_ok (&error);
 	domain->out_of_memory_ex = mono_exception_from_name_two_strings_checked (mono_defaults.corlib, "System", "OutOfMemoryException", arg, NULL, &error);
+    mono_gc_wbarrier_generic_nostore (&domain->out_of_memory_ex);	
 	mono_error_assert_ok (&error);
 
 	/* 
@@ -214,14 +216,17 @@ create_domain_objects (MonoDomain *domain)
 	arg = mono_string_new_checked (domain, "A null value was found where an object instance was required", &error);
 	mono_error_assert_ok (&error);
 	domain->null_reference_ex = mono_exception_from_name_two_strings_checked (mono_defaults.corlib, "System", "NullReferenceException", arg, NULL, &error);
+    mono_gc_wbarrier_generic_nostore (&domain->null_reference_ex);    
 	mono_error_assert_ok (&error);
 	arg = mono_string_new_checked (domain, "The requested operation caused a stack overflow.", &error);
 	mono_error_assert_ok (&error);
 	domain->stack_overflow_ex = mono_exception_from_name_two_strings_checked (mono_defaults.corlib, "System", "StackOverflowException", arg, NULL, &error);
+    mono_gc_wbarrier_generic_nostore (&domain->stack_overflow_ex);    
 	mono_error_assert_ok (&error);
 
 	/*The ephemeron tombstone i*/
 	domain->ephemeron_tombstone = mono_object_new_checked (domain, mono_defaults.object_class, &error);
+    mono_gc_wbarrier_generic_nostore (&domain->ephemeron_tombstone);    
 	mono_error_assert_ok (&error);
 
 	if (domain != old_domain) {
@@ -292,7 +297,9 @@ mono_runtime_init_checked (MonoDomain *domain, MonoThreadStartCB start_cb, MonoT
 
 	ad->data = domain;
 	domain->domain = ad;
+    mono_gc_wbarrier_generic_nostore (&domain->domain);	
 	domain->setup = setup;
+    mono_gc_wbarrier_generic_nostore (&domain->setup);	
 
 	mono_thread_attach (domain);
 

mono/metadata/domain.c

@@ -923,6 +923,7 @@ mono_domain_set_internal_with_options (MonoDomain *domain, gboolean migrate_exce
 
 	SET_APPDOMAIN (domain);
 	SET_APPCONTEXT (domain->default_context);
+    mono_gc_wbarrier_generic_nostore (&domain->default_context);	
 
 	if (migrate_exception) {
 		thread = mono_thread_internal_current ();

mono/metadata/icall.c

@@ -2479,6 +2479,7 @@ ves_icall_RuntimeType_GetInterfaces (MonoReflectionTypeHandle ref_type, MonoErro
 		g_hash_table_destroy (iface_hash);
 		if (!domain->empty_types) {
 			domain->empty_types = mono_array_new_cached (domain, mono_defaults.runtimetype_class, 0, error);
+            mono_gc_wbarrier_generic_nostore (&domain->empty_types);			
 			goto_if_nok (error, fail);
 		}
 		return MONO_HANDLE_NEW (MonoArray, domain->empty_types);

mono/metadata/reflection.c

@@ -534,7 +534,10 @@ mono_type_get_object_checked (MonoDomain *domain, MonoType *type, MonoError *err
 	mono_g_hash_table_insert (domain->type_hash, type, res);
 
 	if (type->type == MONO_TYPE_VOID)
+	{
 		domain->typeof_void = (MonoObject*)res;
+		mono_gc_wbarrier_generic_nostore (&domain->typeof_void);
+	}
 
 	mono_domain_unlock (domain);
 	mono_loader_unlock ();

mono/metadata/threads.c

@@ -523,6 +523,7 @@ set_current_thread_for_domain (MonoDomain *domain, MonoInternalThread *thread, M
 
 	g_assert (!*current_thread_ptr);
 	*current_thread_ptr = current;
+	mono_gc_wbarrier_generic_nostore (current_thread_ptr);
 }
 
 static MonoThread*
@@ -1781,6 +1782,7 @@ mono_thread_current (void)
 	if (!*current_thread_ptr) {
 		g_assert (domain != mono_get_root_domain ());
 		*current_thread_ptr = create_thread_object (domain, internal);
+		mono_gc_wbarrier_generic_nostore (current_thread_ptr);
 	}
 	return *current_thread_ptr;
 }
@@ -1798,6 +1800,7 @@ mono_thread_current_for_thread (MonoInternalThread *internal)
 	if (!*current_thread_ptr) {
 		g_assert (domain != mono_get_root_domain ());
 		*current_thread_ptr = create_thread_object (domain, internal);
+		mono_gc_wbarrier_generic_nostore (current_thread_ptr);
 	}
 	return *current_thread_ptr;
 }
@@ -4139,10 +4142,13 @@ mono_alloc_static_data (gpointer **static_data_ptr, guint32 offset, void *alloc_
 		if (mono_gc_user_markers_supported ())
 			static_data [i] = g_malloc0 (static_data_size [i]);
 		else
+		{
 			static_data [i] = mono_gc_alloc_fixed (static_data_size [i], MONO_GC_DESCRIPTOR_NULL,
 				threadlocal ? MONO_ROOT_SOURCE_THREAD_STATIC : MONO_ROOT_SOURCE_CONTEXT_STATIC,
 				alloc_key,
 				threadlocal ? "ThreadStatic Fields" : "ContextStatic Fields");
+            mono_gc_wbarrier_generic_nostore (static_data + i);				
+		}
 	}
 }
 
@@ -4221,6 +4227,7 @@ context_adjust_static_data (MonoAppContext *ctx)
 	if (context_static_info.offset || context_static_info.idx > 0) {
 		guint32 offset = MAKE_SPECIAL_STATIC_OFFSET (context_static_info.idx, context_static_info.offset, 0);
 		mono_alloc_static_data (&ctx->static_data, offset, ctx, FALSE);
+        mono_gc_wbarrier_generic_nostore (&ctx->static_data);		
 		ctx->data->static_data = ctx->static_data;
 	}
 }
@@ -4250,6 +4257,7 @@ alloc_context_static_data_helper (gpointer key, gpointer value, gpointer user)
 
 	guint32 offset = GPOINTER_TO_UINT (user);
 	mono_alloc_static_data (&ctx->static_data, offset, ctx, FALSE);
+	mono_gc_wbarrier_generic_nostore (&ctx->static_data);	
 	ctx->data->static_data = ctx->static_data;
 }