Update RMethodInfo RConstructorInfo Equals override to fix CI test fa…

…ilures
buyaa-n · Aug 3, 2022 · d4d961c · d4d961c
1 parent 8ee9566
commit d4d961c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.CoreCLR.cs
@@ -121,7 +121,11 @@ public override string ToString()
         }
 
         public override bool Equals(object? obj) =>
-            obj is RuntimeConstructorInfo ci && m_handle == ci.m_handle;
+            ReferenceEquals(this, obj) ||
+            (MetadataUpdater.IsSupported &&
+                obj is RuntimeConstructorInfo ci &&
+                MetadataToken == ci.MetadataToken &&
+                m_declaringType.Equals(ci.m_declaringType));
 
         public override int GetHashCode() => RuntimeHelpers.GetHashCodeOfPtr(m_handle);
         #endregion

diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs
@@ -160,10 +160,12 @@ public override string ToString()
 
         public override int GetHashCode() => RuntimeHelpers.GetHashCodeOfPtr(m_handle);
 
-        public override bool Equals(object? obj)
-        {
-            return obj is RuntimeMethodInfo m && m_handle == m.m_handle;
-        }
+        public override bool Equals(object? obj) =>
+            ReferenceEquals(this, obj) ||
+                (MetadataUpdater.IsSupported &&
+                obj is RuntimeMethodInfo m &&
+                m.MetadataToken == MetadataToken &&
+                m_declaringType.Equals(m.m_declaringType));
         #endregion
 
         #region ICustomAttributeProvider