Fix mono error; fix debug-build stack-walk issue

dotnet · Apr 3, 2022 · c3a8c14 · c3a8c14
1 parent b8e3967
commit c3a8c14
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/coreclr/vm/appdomain.cpp b/src/coreclr/vm/appdomain.cpp
@@ -1556,7 +1556,10 @@ bool SystemDomain::IsReflectionInvocationMethod(MethodDesc* pMeth)
         CLASS__RUNTIME_HELPERS,
         CLASS__DYNAMICMETHOD,
         CLASS__DELEGATE,
-        CLASS__MULTICAST_DELEGATE
+        CLASS__MULTICAST_DELEGATE,
+        CLASS__METHOD_INVOKER,
+        CLASS__CONSTRUCTOR_INVOKER,
+        CLASS__DYNAMIC_METHOD_INVOKER
     };
 
     static bool fInited = false;

diff --git a/src/coreclr/vm/corelib.h b/src/coreclr/vm/corelib.h
@@ -512,6 +512,9 @@ DEFINE_CLASS(VECTORT,               Numerics,               Vector`1)
 
 DEFINE_CLASS(MEMBER,                Reflection,             MemberInfo)
 
+DEFINE_CLASS(METHOD_INVOKER,        Reflection,             MethodInvoker)
+DEFINE_CLASS(CONSTRUCTOR_INVOKER,   Reflection,             ConstructorInvoker)
+DEFINE_CLASS(DYNAMIC_METHOD_INVOKER,ReflectionEmit,         DynamicMethodInvoker)
 
 DEFINE_CLASS_U(Reflection,             RuntimeMethodInfo,  NoClass)
 DEFINE_FIELD_U(m_handle,                   ReflectMethodObject, m_pMD)

diff --git a/src/mono/System.Private.CoreLib/src/System/RuntimeType.Mono.cs b/src/mono/System.Private.CoreLib/src/System/RuntimeType.Mono.cs
@@ -1669,7 +1669,9 @@ internal override FieldInfo GetField(FieldInfo fromNoninstanciated)
         // Once Mono has managed conversion logic, this method can be removed and the Core
         // implementation of this method moved to RuntimeMethod.Invoke().
 #if DEBUG
+#pragma warning disable CA1822
         internal void VerifyValueType(object? value) { }
+#pragma warning restore CA1822
 #endif
 
         /// <summary>