Fixed Ourpalm#729

zfs990 · Oct 7, 2022 · 3ef13ca · 3ef13ca
1 parent 0d3f3bb
commit 3ef13ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ILRuntime/CLR/Method/ILMethod.cs b/ILRuntime/CLR/Method/ILMethod.cs
@@ -27,6 +27,7 @@ public sealed class ILMethod : IMethod
         ExceptionHandler[] exceptionHandler, exceptionHandlerR;
         KeyValuePair<string, IType>[] genericParameters;
         IType[] genericArguments;
+        ILMethod genericDefinition;
         Dictionary<int, int[]> jumptables, jumptablesR;
         bool isDelegateInvoke;
         bool isEventAdd, isEventRemove;
@@ -159,6 +160,7 @@ public Mono.Collections.Generic.Collection<Mono.Cecil.Cil.VariableDefinition> Va
 
         public IType[] GenericArugmentsArray { get { return genericArguments; } }
 
+        public ILMethod GenericDefinition { get { return genericDefinition; } } 
         public bool ShouldUseRegisterVM
         {
             get
@@ -958,6 +960,7 @@ public IMethod MakeGenericMethod(IType[] genericArguments)
             ILMethod m = new ILMethod(def, declaringType, appdomain, jitFlags);
             m.genericParameters = genericParameters;
             m.genericArguments = genericArguments;
+            m.genericDefinition = this;
             if (m.def.ReturnType.IsGenericParameter)
             {
                 m.ReturnType = m.FindGenericArgument(m.def.ReturnType.Name);

diff --git a/ILRuntime/Runtime/Debugger/DebugService.cs b/ILRuntime/Runtime/Debugger/DebugService.cs
@@ -469,7 +469,7 @@ unsafe internal void CheckShouldBreak(ILMethod method, ILIntepreter intp, int ip
                 }
                 StackObject* basePointer = ResolveCurrentFrameBasePointer(intp, method, ip);
 
-                int methodHash = m.GetHashCode();
+                int methodHash = m.IsGenericInstance ? m.GenericDefinition.GetHashCode() : m.GetHashCode();
                 BreakpointInfo[] lst = null;
 
                 lock (activeBreakpoints)