Include missing reflected type in hashcode calculation

src/coreclr/System.Private.CoreLib/src/System/Reflection/MdFieldInfo.cs

@@ -53,7 +53,7 @@ obj is MdFieldInfo fi &&
                 ReferenceEquals(fi.m_reflectedTypeCache.GetRuntimeType(), m_reflectedTypeCache.GetRuntimeType()));
 
         public override int GetHashCode() =>
-            HashCode.Combine(m_tkField.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
+            HashCode.Combine(m_tkField.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode(), m_reflectedTypeCache.GetRuntimeType().GetUnderlyingNativeHandle().GetHashCode());
         #endregion
 
         #region FieldInfo Overrides

src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

@@ -74,7 +74,7 @@ obj is RtFieldInfo fi &&
                 ReferenceEquals(fi.m_reflectedTypeCache.GetRuntimeType(), m_reflectedTypeCache.GetRuntimeType()));
 
         public override int GetHashCode() =>
-            HashCode.Combine(m_fieldHandle.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
+            HashCode.Combine(m_fieldHandle.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode(), m_reflectedTypeCache.GetRuntimeType().GetUnderlyingNativeHandle().GetHashCode());
 
         #endregion
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.CoreCLR.cs

@@ -122,7 +122,7 @@ public override bool Equals(object? obj) =>
             (MetadataUpdater.IsSupported && CacheEquals(obj));
 
         public override int GetHashCode() =>
-            HashCode.Combine(m_handle.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
+            HashCode.Combine(m_handle.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode(), m_reflectedTypeCache.GetRuntimeType().GetUnderlyingNativeHandle().GetHashCode());
         #endregion
 
         #region ICustomAttributeProvider

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeEventInfo.cs

@@ -82,7 +82,7 @@ obj is RuntimeEventInfo ei &&
                 ReferenceEquals(ei.m_reflectedTypeCache.GetRuntimeType(), m_reflectedTypeCache.GetRuntimeType()));
 
         public override int GetHashCode() =>
-            HashCode.Combine(m_token.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
+            HashCode.Combine(m_token.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode(), m_reflectedTypeCache.GetRuntimeType().GetUnderlyingNativeHandle().GetHashCode());
         #endregion
 
         #region ICustomAttributeProvider

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs

@@ -159,7 +159,7 @@ public override string ToString()
         // retrieve items from and insert items into s_methodInstantiations.
 
         public override int GetHashCode() =>
-            HashCode.Combine(m_handle.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
+            HashCode.Combine(m_handle.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode(), m_reflectedTypeCache.GetRuntimeType().GetUnderlyingNativeHandle().GetHashCode());
 
         public override bool Equals(object? obj) =>
             obj is RuntimeMethodInfo m && m_handle == m.m_handle &&

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimePropertyInfo.cs

@@ -190,7 +190,7 @@ public override bool Equals(object? obj) =>
                 ReferenceEquals(rpi.m_reflectedTypeCache.GetRuntimeType(), m_reflectedTypeCache.GetRuntimeType()));
 
         public override int GetHashCode() =>
-            HashCode.Combine(m_token.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
+            HashCode.Combine(m_token.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode(), m_reflectedTypeCache.GetRuntimeType().GetUnderlyingNativeHandle().GetHashCode());
         #endregion
 
         #region PropertyInfo Overrides

src/libraries/System.Runtime/tests/System.Reflection.Tests/EventInfoTests.cs

@@ -152,6 +152,14 @@ public void EqualsTest(Type type1, string name1, Type type2, string name2, bool
             }
         }
 
+        [Fact]
+        public void GetHashCode_WithSameBaseClass_ShouldNotEqual()
+        {
+            var eventInfoBase = typeof(BaseClass).GetEvent(nameof(BaseClass.PublicVirtualEvent));
+            var eventInfoSub = typeof(SubClass).GetEvent(nameof(SubClass.PublicVirtualEvent));
+            Assert.NotEqual(eventInfoBase.GetHashCode(), eventInfoSub.GetHashCode());
+        }
+
         [Theory]
         [MemberData(nameof(Events_TestData))]
         public void EventHandlerType(Type type, string name)

src/libraries/System.Runtime/tests/System.Reflection.Tests/FieldInfoTests.cs

@@ -333,6 +333,14 @@ public void GetHashCodeTest()
             Assert.NotEqual(0, fieldInfo.GetHashCode());
         }
 
+        [Fact]
+        public void GetHashCode_WithSameBaseClass_ShouldNotEqual()
+        {
+            var fieldInfoBase = typeof(FI_BaseClass).GetField(nameof(FI_BaseClass.intField));
+            var fieldInfoSub = typeof(FI_SubClass).GetField(nameof(FI_SubClass.intField));
+            Assert.NotEqual(fieldInfoBase.GetHashCode(), fieldInfoSub.GetHashCode());
+        }
+
         [Theory]
         [InlineData(typeof(FieldInfoTests), nameof(FieldInfoTests.intField), typeof(int))]
         [InlineData(typeof(FieldInfoTests), nameof(FieldInfoTests.stringField), typeof(string))]
@@ -719,7 +727,10 @@ public enum LongEnum : long { }
         public static FI_GenericClass<object>[] gpa_g_object = new FI_GenericClass<object>[] { g_object, g_object };
         public static FI_GenericClass<FI_GenericClass<object>>[] ga_g_object = new FI_GenericClass<FI_GenericClass<object>>[] { g_g_object, g_g_object, g_g_object, g_g_object };
 
-        public class FI_BaseClass { }
+        public class FI_BaseClass
+        {
+            public int intField;
+        }
         public class FI_SubClass : FI_BaseClass { }
 
         public interface FI_Interface { }

src/libraries/System.Runtime/tests/System.Reflection.Tests/MethodInfoTests.cs

@@ -346,6 +346,14 @@ public void GetHashCodeTest()
             Assert.NotEqual(0, methodInfo.GetHashCode());
         }
 
+        [Fact]
+        public void GetHashCode_WithSameBaseClass_ShouldNotEqual()
+        {
+            var methodInfoBase = typeof(MI_BaseClass).GetMethod(nameof(MI_BaseClass.IMethod));
+            var methodInfoSub = typeof(MI_SubClass).GetMethod(nameof(MI_SubClass.IMethod));
+            Assert.NotEqual(methodInfoBase.GetHashCode(), methodInfoSub.GetHashCode());
+        }
+
         public static IEnumerable<object[]> Invoke_TestData()
         {
             yield return new object[] { typeof(MI_BaseClass), nameof(MI_BaseClass.VirtualReturnIntMethod), new MI_BaseClass(), null, 0 };

src/libraries/System.Runtime/tests/System.Reflection.Tests/PropertyInfoTests.cs

@@ -292,6 +292,14 @@ public void GetHashCodeTest()
             Assert.NotEqual(0, propertyInfo.GetHashCode());
         }
 
+        [Fact]
+        public void GetHashCode_WithSameBaseClass_ShouldNotEqual()
+        {
+            var propertyInfoBase = typeof(BaseClass).GetProperty(nameof(BaseClass.IntProperty));
+            var propertyInfoSub = typeof(SubClass).GetProperty(nameof(SubClass.IntProperty));
+            Assert.NotEqual(propertyInfoBase.GetHashCode(), propertyInfoSub.GetHashCode());
+        }
+
         [Theory]
         [InlineData(typeof(BaseClass), "Item", new string[] { "Index" })]
         [InlineData(typeof(BaseClass), nameof(BaseClass.ReadWriteProperty1), new string[0])]