[runtime] Implement mono_class_value_size for CoreCLR. (#11554)

xamarin · May 14, 2021 · ab14e07 · ab14e07 · vs-mobiletools-engineering-service2 · May 14, 2021
1 parent eab3acc
commit ab14e07
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/runtime/coreclr-bridge.m b/runtime/coreclr-bridge.m
@@ -566,6 +566,16 @@
 	return rv;
 }
 
+int32_t
+mono_class_value_size (MonoClass *klass, uint32_t *align)
+{
+	int32_t rv = xamarin_bridge_sizeof (klass);
+
+	LOG_CORECLR (stderr, "%s (%p, %p) => %i\n", __func__, klass, align, rv);
+
+	return rv;
+}
+
 gboolean
 mono_class_is_nullable (MonoClass * klass)
 {

diff --git a/runtime/delegates.t4 b/runtime/delegates.t4
@@ -400,6 +400,14 @@
 			OnlyCoreCLR = true,
 		},
 
+		new XDelegate ("int32_t", "int", "xamarin_bridge_sizeof",
+			"MonoObject *", "MonoObject *", "typeobj"
+		) {
+			WrappedManagedFunction = "SizeOf",
+			OnlyDynamicUsage = false,
+			OnlyCoreCLR = true,
+		},
+
 		new XDelegate ("MonoReferenceQueue *", "MonoObject *", "xamarin_bridge_gc_reference_queue_new",
 			"mono_reference_queue_callback", "IntPtr", "callback"
 		) {

diff --git a/runtime/exports.t4 b/runtime/exports.t4
@@ -84,7 +84,9 @@
 		new Export ("int32_t", "mono_class_value_size",
 			"MonoClass *", "klass",
 			"uint32_t *", "align"
-		),
+		) {
+			HasCoreCLRBridgeFunction = true,
+		},
 
 		new Export ("MonoType *", "mono_class_get_type",
 			"MonoClass *", "klass"

diff --git a/src/ObjCRuntime/Runtime.CoreCLR.cs b/src/ObjCRuntime/Runtime.CoreCLR.cs
@@ -427,6 +427,12 @@ unsafe static IntPtr ClassGetName (MonoObject *typeobj)
 			return (MonoObject *) GetMonoObject (type);
 		}
 
+		static unsafe int SizeOf (MonoObject* typeobj)
+		{
+			var type = (Type) GetMonoObjectTarget (typeobj);
+			return SizeOf (type);
+		}
+
 		static int SizeOf (Type type)
 		{
 			if (type.IsEnum) // https://github.com/dotnet/runtime/issues/12258