Added fix for calling virtual method on baseclass which is not defined.

rmadsen-ks · filmor · commit 0c995516ac30 · 2025-12-08T11:29:36.000+01:00
diff --git a/src/runtime/Types/ClassDerived.cs b/src/runtime/Types/ClassDerived.cs
@@ -396,7 +396,7 @@ private static void AddVirtualMethod(MethodInfo method, Type baseType, TypeBuild
             string? baseMethodName = null;
             if (!method.IsAbstract)
             {
-                baseMethodName = "_" + baseType.Name + "__" + method.Name;
+                baseMethodName = "_" + method.DeclaringType.Name + "__" + method.Name;
                 MethodBuilder baseMethodBuilder = typeBuilder.DefineMethod(baseMethodName,
                     MethodAttributes.Public |
                     MethodAttributes.Final |
diff --git a/src/testing/classtest.cs b/src/testing/classtest.cs
@@ -76,4 +76,9 @@ public virtual string SayGoodbye()
             return "!";
         }
     }
+
+    public class SimpleClass2 : SimpleClass
+    {
+        // this class does not override SayGoodbye.
+    }
 }
diff --git a/tests/test_subclass.py b/tests/test_subclass.py
@@ -9,7 +9,7 @@
 import System
 import pytest
 from Python.Test import (IInterfaceTest, SubClassTest, EventArgsTest,
-                         FunctionsTest, IGenericInterface, GenericVirtualMethodTest, SimpleClass, ISayHello1)
+                         FunctionsTest, IGenericInterface, GenericVirtualMethodTest, SimpleClass, SimpleClass2, ISayHello1)
 from System.Collections.Generic import List
 
 
@@ -355,7 +355,7 @@ def test_multi_level_subclass():
     exception if a method was not implemented in the middle of the tree.
     """
     import clr
-    class DualSubClass0(ISayHello1, SimpleClass):
+    class DualSubClass0(ISayHello1, SimpleClass2):
         __namespace__ = "Test"
         def SayHello(self):
             return "hello"

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ private static void AddVirtualMethod(MethodInfo method, Type baseType, TypeBuild`
`396`	`396`	`string? baseMethodName = null;`
`397`	`397`	`if (!method.IsAbstract)`
`398`	`398`	`{`
`399`		`- baseMethodName = "_" + baseType.Name + "__" + method.Name;`
	`399`	`+ baseMethodName = "_" + method.DeclaringType.Name + "__" + method.Name;`
`400`	`400`	`MethodBuilder baseMethodBuilder = typeBuilder.DefineMethod(baseMethodName,`
`401`	`401`	`MethodAttributes.Public \|`
`402`	`402`	`MethodAttributes.Final \|`
Original file line number	Diff line number	Diff line change
`@@ -76,4 +76,9 @@ public virtual string SayGoodbye()`
`76`	`76`	`return "!";`
`77`	`77`	`}`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ public class SimpleClass2 : SimpleClass`
	`81`	`+ {`
	`82`	`+ // this class does not override SayGoodbye.`
	`83`	`+ }`
`79`	`84`	`}`