From 9055c8b01bc7ceba6ecb282b44528b38e1ac7694 Mon Sep 17 00:00:00 2001
From: Bill Holmes <bill.holmes@unity3d.com>
Date: Fri, 4 Feb 2022 10:19:13 -0500
Subject: [PATCH] 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
---
 src/mono/mono/mini/mini-exceptions.c | 2 +-
 src/tests/issues.targets             | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/mono/mono/mini/mini-exceptions.c b/src/mono/mono/mini/mini-exceptions.c
index f814096630b0bd..412c9af50d7513 100644
--- a/src/mono/mono/mini/mini-exceptions.c
+++ b/src/mono/mono/mini/mini-exceptions.c
@@ -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)) {
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 47b8f3981b8459..49579ecd10dbc7 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -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'">