未验证 提交 9055c8b0 编写于 作者: B Bill Holmes 提交者: GitHub

mono_get_generic_info_from_stack_frame fix for default interface methods (#64566)

The context is a MonoMethodRuntimeGenericContext when the method is a
default interface method.

Also re-enable broken DIM tests.

Fixes dotnet/runtime #62334
上级 607dccee
......@@ -849,7 +849,7 @@ mono_get_generic_info_from_stack_frame (MonoJitInfo *ji, MonoContext *ctx)
}
method = jinfo_get_method (ji);
if (mono_method_get_context (method)->method_inst) {
if (mono_method_get_context (method)->method_inst || mini_method_is_default_method (method)) {
/* A MonoMethodRuntimeGenericContext* */
return info;
} else if ((method->flags & METHOD_ATTRIBUTE_STATIC) || m_class_is_valuetype (method->klass)) {
......
......@@ -2902,9 +2902,6 @@
<ExcludeList Include = "$(XunitTestBinBase)/tracing/eventcounter/**">
<Issue> needs triage </Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/regressions/github60486/**">
<Issue>https://github.com/dotnet/runtime/issues/62334</Issue>
</ExcludeList>
</ItemGroup>
<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmfullaot' or '$(RuntimeVariant)' == 'llvmaot') and '$(TargetArchitecture)' == 'arm64'">
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册