Merge pull request #1012 from Unity-Technologies/incremental-boehm-strict-mode

jechter · web-flow · commit def34449b611 · 2018-08-14T17:12:01.000+02:00
Incremental boehm strict mode
diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
@@ -712,7 +712,7 @@ mono_gc_finalize_notify (void)
 	g_message ( "%s: prodding finalizer", __func__);
 #endif
 
-	if (mono_gc_is_null ())
+	if (mono_gc_is_null () || mono_gc_is_disabled())
 		return;
 
 #ifdef HOST_WASM
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
@@ -1402,6 +1402,7 @@ ves_icall_System_Threading_Thread_ConstructInternalThread (MonoThread *this_obj)
 	internal->state = ThreadState_Unstarted;
 
 	mono_atomic_cas_ptr ((volatile gpointer *)&this_obj->internal_thread, internal, NULL);
+	mono_gc_wbarrier_generic_nostore (&this_obj->internal_thread);
 }
 
 MonoThread *

Original file line number	Diff line number	Diff line change
`@@ -1402,6 +1402,7 @@ ves_icall_System_Threading_Thread_ConstructInternalThread (MonoThread *this_obj)`
`1402`	`1402`	`internal->state = ThreadState_Unstarted;`
`1403`	`1403`
`1404`	`1404`	`mono_atomic_cas_ptr ((volatile gpointer *)&this_obj->internal_thread, internal, NULL);`
	`1405`	`+ mono_gc_wbarrier_generic_nostore (&this_obj->internal_thread);`
`1405`	`1406`	`}`
`1406`	`1407`
`1407`	`1408`	`MonoThread *`