Skip to content

Commit 867a434

Browse files
committed
Revert "[mono] Fix StackTrace from a dim and Vtable offsets for static interface method (#60770)"
This reverts commit 5789792.
1 parent dbd1955 commit 867a434

File tree

4 files changed

+2
-212
lines changed

4 files changed

+2
-212
lines changed

src/mono/mono/metadata/object.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,8 +1518,6 @@ build_imt_slots (MonoClass *klass, MonoVTable *vt, gpointer* imt, GSList *extra_
15181518
* add_imt_builder_entry anyway.
15191519
*/
15201520
method = mono_class_get_method_by_index (mono_class_get_generic_class (iface)->container_class, method_slot_in_interface);
1521-
if (m_method_is_static (method))
1522-
continue;
15231521
if (mono_method_get_imt_slot (method) != slot_num) {
15241522
vt_slot ++;
15251523
continue;

src/mono/mono/mini/mini-exceptions.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -840,13 +840,12 @@ mono_get_generic_context_from_stack_frame (MonoJitInfo *ji, gpointer generic_inf
840840

841841
method = jinfo_get_method (ji);
842842
g_assert (method->is_inflated);
843-
if (mono_method_get_context (method)->method_inst || mini_method_is_default_method (method)) {
843+
if (mono_method_get_context (method)->method_inst) {
844844
MonoMethodRuntimeGenericContext *mrgctx = (MonoMethodRuntimeGenericContext *)generic_info;
845845

846846
klass = mrgctx->class_vtable->klass;
847847
context.method_inst = mrgctx->method_inst;
848-
if (!mini_method_is_default_method (method))
849-
g_assert (context.method_inst);
848+
g_assert (context.method_inst);
850849
} else {
851850
MonoVTable *vtable = (MonoVTable *)generic_info;
852851

@@ -859,12 +858,6 @@ mono_get_generic_context_from_stack_frame (MonoJitInfo *ji, gpointer generic_inf
859858
else
860859
method_container_class = method->klass;
861860

862-
if (mini_method_is_default_method (method)) {
863-
if (mono_class_is_ginst (klass) || mono_class_is_gtd (klass))
864-
context.class_inst = mini_class_get_context (klass)->class_inst;
865-
return context;
866-
}
867-
868861
/* class might refer to a subclass of method's class */
869862
while (!(klass == method->klass || (mono_class_is_ginst (klass) && mono_class_get_generic_class (klass)->container_class == method_container_class))) {
870863
klass = m_class_get_parent (klass);

src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs

Lines changed: 0 additions & 190 deletions
This file was deleted.

src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)