Use mono_gc_wbarrier_set_field instead of il2cpp_gc_wbarrier_set_field, so we can use barriers on both mono and il2cpp

Author: jechter

mono/mini/debugger-agent.c

@@ -4178,11 +4178,9 @@ thread_startup (MonoProfiler *prof, uintptr_t tid)
 	tls = g_new0 (DebuggerTlsData, 1);
 #endif
 	MONO_GC_REGISTER_ROOT_SINGLE (tls->thread, MONO_ROOT_SOURCE_DEBUGGER, NULL, "Debugger Thread Reference");
+	mono_gc_wbarrier_set_field(tls, (void**)&tls->thread, thread);
 #ifdef RUNTIME_IL2CPP
-	il2cpp_gc_wbarrier_set_field(tls, (void**)&tls->thread, thread);
 	tls->il2cpp_context = il2cpp_debugger_get_thread_context ();
-#else
-	tls->thread = thread;
 #endif	
 	mono_native_tls_set_value (debugger_tls_id, tls);
 
@@ -4220,11 +4218,7 @@ thread_end (MonoProfiler *prof, uintptr_t tid)
 #ifndef RUNTIME_IL2CPP
 			MONO_GC_UNREGISTER_ROOT (tls->thread);
 #endif
-#ifdef RUNTIME_IL2CPP
-			il2cpp_gc_wbarrier_set_field(tls, (void**)&tls->thread, NULL);
-#else
-			tls->thread = NULL;
-#endif			
+			mono_gc_wbarrier_set_field(tls, (void**)&tls->thread, NULL);
 		}
 	}
 	mono_loader_unlock ();
@@ -7736,11 +7730,7 @@ decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr,
 					g_free (vtype_buf);
 					return err;
 				}
-#ifdef RUNTIME_IL2CPP 
-				il2cpp_gc_wbarrier_set_field(NULL, (void**)addr, mono_value_box_checked (d, klass, vtype_buf, &error));
-#else				
-				*(MonoObject**)addr = mono_value_box_checked (d, klass, vtype_buf, &error);
-#endif
+				mono_gc_wbarrier_set_field(NULL, (void**)addr, mono_value_box_checked (d, klass, vtype_buf, &error));
 				mono_error_cleanup (&error);
 				g_free (vtype_buf);
 			} else {