Skip to content

Commit

Permalink
mono_get_generic_info_from_stack_frame fix for default interface meth…
Browse files Browse the repository at this point in the history
…ods (#64566)

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

Also re-enable broken DIM tests.

Fixes dotnet/runtime #62334
  • Loading branch information
bholmes authored Feb 4, 2022
1 parent 607dcce commit 9055c8b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion src/mono/mono/mini/mini-exceptions.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
3 changes: 0 additions & 3 deletions src/tests/issues.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand Down

0 comments on commit 9055c8b

Please sign in to comment.