Use a different function for emitting write barriers for gsharedvt ty…

…pes which can handle reference types too. Fixes mono#12429.
midnite8177 · May 29, 2013 · 4e7ae2d · 4e7ae2d
1 parent 4ffdf1c
commit 4e7ae2d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/mono/mini/jit-icalls.c b/mono/mini/jit-icalls.c
@@ -1222,3 +1222,12 @@ mono_object_equals_gsharedvt (gpointer mp, MonoMethod *cmethod, MonoClass *klass
 	p = mono_object_unbox (res);
 	return *(gboolean*)p;
 }
+
+void
+mono_gsharedvt_value_copy (gpointer dest, gpointer src, MonoClass *klass)
+{
+	if (klass->valuetype)
+		mono_value_copy (dest, src, klass);
+	else
+        mono_gc_wbarrier_generic_store (dest, *(MonoObject**)src);
+}
diff --git a/mono/mini/jit-icalls.h b/mono/mini/jit-icalls.h
@@ -181,5 +181,7 @@ int mono_object_gethashcode_gsharedvt (gpointer mp, MonoMethod *cmethod, MonoCla
 
 gboolean mono_object_equals_gsharedvt (gpointer mp, MonoMethod *cmethod, MonoClass *klass, MonoObject *arg) MONO_INTERNAL;
 
+void mono_gsharedvt_value_copy (gpointer dest, gpointer src, MonoClass *klass) MONO_INTERNAL;
+
 #endif /* __MONO_JIT_ICALLS_H__ */
 
diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
@@ -2922,7 +2922,10 @@ mini_emit_stobj (MonoCompile *cfg, MonoInst *dest, MonoInst *src, MonoClass *kla
 				}
 			}
 
-			mono_emit_jit_icall (cfg, mono_value_copy, iargs);
+			if (size_ins)
+				mono_emit_jit_icall (cfg, mono_gsharedvt_value_copy, iargs);
+			else
+				mono_emit_jit_icall (cfg, mono_value_copy, iargs);
 			return;
 		}
 	}

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
@@ -7166,6 +7166,7 @@ mini_init (const char *filename, const char *runtime_version)
 	register_icall (mono_object_tostring_gsharedvt, "mono_object_tostring_gsharedvt", "object ptr ptr ptr", TRUE);
 	register_icall (mono_object_gethashcode_gsharedvt, "mono_object_gethashcode_gsharedvt", "int ptr ptr ptr", TRUE);
 	register_icall (mono_object_equals_gsharedvt, "mono_object_equals_gsharedvt", "int ptr ptr ptr object", TRUE);
+	register_icall (mono_gsharedvt_value_copy, "mono_gsharedvt_value_copy", "void ptr ptr ptr", TRUE);
 
 	register_icall (mono_gc_wbarrier_value_copy_bitmap, "mono_gc_wbarrier_value_copy_bitmap", "void ptr ptr int int", FALSE);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -181,5 +181,7 @@ int mono_object_gethashcode_gsharedvt (gpointer mp, MonoMethod *cmethod, MonoCla

		gboolean mono_object_equals_gsharedvt (gpointer mp, MonoMethod cmethod, MonoClass klass, MonoObject *arg) MONO_INTERNAL;

		void mono_gsharedvt_value_copy (gpointer dest, gpointer src, MonoClass *klass) MONO_INTERNAL;

		#endif /* __MONO_JIT_ICALLS_H__ */