[release/7.0-rc1] [mono] Implement missing functionality for cctor invocation (#74043)

github-actions[bot] · BrzVlad · web-flow · commit 8baff7df0062 · 2022-08-17T09:24:40.000-07:00
* [mono] Implement missing functionality for cctor invocation

* [mono] Re-enable test

Co-authored-by: Vlad Brezae &lt;brezaevlad@gmail.com&gt;
diff --git a/src/libraries/System.Reflection/tests/ConstructorInfoTests.cs b/src/libraries/System.Reflection/tests/ConstructorInfoTests.cs
@@ -69,7 +69,6 @@ public void Invoke_StaticConstructor_NullObject_NullParameters()
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsInvokingStaticConstructorsSupported))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/40351", TestRuntimes.Mono)]
         public void Invoke_StaticConstructorMultipleTimes()
         {
             ConstructorInfo[] constructors = GetConstructors(typeof(ClassWithStaticConstructorThatIsCalledMultipleTimesViaReflection));
diff --git a/src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.Mono.cs
@@ -802,10 +802,13 @@ internal RuntimeType[] ArgumentTypes
             }
         }
 
-        private static void InvokeClassConstructor()
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern void InvokeClassConstructor(QCallTypeHandle type);
+
+        private void InvokeClassConstructor()
         {
-            // [TODO] Mechanism for invoking class constructor
-            // See https://github.com/dotnet/runtime/issues/40351
+            RuntimeType type = (RuntimeType)DeclaringType;
+            InvokeClassConstructor(new QCallTypeHandle(ref type));
         }
 
         /*
diff --git a/src/mono/mono/metadata/icall-def.h b/src/mono/mono/metadata/icall-def.h
@@ -357,6 +357,7 @@ HANDLES(RASSEM_7, "InternalGetReferencedAssemblies", ves_icall_System_Reflection
 ICALL_TYPE(MCMETH, "System.Reflection.RuntimeConstructorInfo", MCMETH_1)
 HANDLES(MCMETH_1, "GetGenericMethodDefinition_impl", ves_icall_RuntimeMethodInfo_GetGenericMethodDefinition, MonoReflectionMethod, 1, (MonoReflectionMethod))
 HANDLES(MCMETH_2, "InternalInvoke", ves_icall_InternalInvoke, MonoObject, 4, (MonoReflectionMethod, MonoObject, MonoSpanOfObjects_ref, MonoExceptionOut))
+HANDLES(MCMETH_5, "InvokeClassConstructor", ves_icall_InvokeClassConstructor, void, 1, (MonoQCallTypeHandle))
 HANDLES_REUSE_WRAPPER(MCMETH_4, "get_metadata_token", ves_icall_reflection_get_token)
 
 ICALL_TYPE(CATTR_DATA, "System.Reflection.RuntimeCustomAttributeData", CATTR_DATA_1)
diff --git a/src/mono/mono/metadata/icall.c b/src/mono/mono/metadata/icall.c
@@ -2809,6 +2809,18 @@ ves_icall_RuntimeTypeHandle_IsComObject (MonoQCallTypeHandle type_handle, MonoEr
 	return mono_class_is_com_object (klass);
 }
 
+void
+ves_icall_InvokeClassConstructor (MonoQCallTypeHandle type_handle, MonoError *error)
+{
+	MonoType *type = type_handle.type;
+	MonoClass *klass = mono_class_from_mono_type_internal (type);
+
+	MonoVTable *vtable = mono_class_vtable_checked (klass, error);
+	return_if_nok (error);
+
+	mono_runtime_class_init_full (vtable, error);
+}
+
 guint32
 ves_icall_reflection_get_token (MonoObjectHandle obj, MonoError *error)
 {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ public void Invoke_StaticConstructor_NullObject_NullParameters()`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsInvokingStaticConstructorsSupported))]`
`72`		`- [ActiveIssue("https://github.com/dotnet/runtime/issues/40351", TestRuntimes.Mono)]`
`73`	`72`	`public void Invoke_StaticConstructorMultipleTimes()`
`74`	`73`	`{`
`75`	`74`	`ConstructorInfo[] constructors = GetConstructors(typeof(ClassWithStaticConstructorThatIsCalledMultipleTimesViaReflection));`
Original file line number	Diff line number	Diff line change
`@@ -802,10 +802,13 @@ internal RuntimeType[] ArgumentTypes`
`802`	`802`	`}`
`803`	`803`	`}`
`804`	`804`
`805`		`- private static void InvokeClassConstructor()`
	`805`	`+ [MethodImplAttribute(MethodImplOptions.InternalCall)]`
	`806`	`+ internal static extern void InvokeClassConstructor(QCallTypeHandle type);`
	`807`	`+`
	`808`	`+ private void InvokeClassConstructor()`
`806`	`809`	`{`
`807`		`- // [TODO] Mechanism for invoking class constructor`
`808`		`- // See https://github.com/dotnet/runtime/issues/40351`
	`810`	`+ RuntimeType type = (RuntimeType)DeclaringType;`
	`811`	`+ InvokeClassConstructor(new QCallTypeHandle(ref type));`
`809`	`812`	`}`
`810`	`813`
`811`	`814`	`/*`