Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not check object references for equality after hot reload #73009

Merged
merged 20 commits into from
Aug 8, 2022
Merged

Do not check object references for equality after hot reload #73009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
560e4cb
Equality check of type members after hot reload
buyaa-n Jul 28, 2022
bfe943b
Apply comments
buyaa-n Jul 29, 2022
76e2b02
Apply feedback
buyaa-n Aug 1, 2022
71e176d
Renamed the propertyName in test
buyaa-n Aug 1, 2022
1b0d414
Compare type instead of module, check MetadataUpdater.IsSupported in …
buyaa-n Aug 2, 2022
621d6f7
Update and use CacheEquals
buyaa-n Aug 2, 2022
97bde09
Apply feedbacks
buyaa-n Aug 2, 2022
11355a4
Use ReferenceEquals
buyaa-n Aug 2, 2022
dffe2ab
Merge conflicts
buyaa-n Aug 2, 2022
9d30a95
apply more feedback
buyaa-n Aug 2, 2022
74c8563
Exclude RuntimeParameterInfo
buyaa-n Aug 2, 2022
8ee9566
Update assert methods in test
buyaa-n Aug 3, 2022
d4d961c
Update RMethodInfo RConstructorInfo Equals override to fix CI test fa…
buyaa-n Aug 3, 2022
b9dc388
Revert "Update RMethodInfo RConstructorInfo Equals override to fix CI…
jkotas Aug 4, 2022
ea07c6f
Fix tests
jkotas Aug 4, 2022
06681a8
Update RuntimeConstructorInfo Equals, HashCode similarly
buyaa-n Aug 4, 2022
eb9d197
Add reflected type into Equals, check MetadataUpdater.IsSupported in …
buyaa-n Aug 6, 2022
72d21c6
Perf tweaks for Equals and GetHashCode
jkotas Aug 6, 2022
cbeb099
Apply suggestions from code review
buyaa-n Aug 6, 2022
4730c9f
Apply feedback
buyaa-n Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ public override string ToString()
public override bool Equals(object? obj) =>
obj is RuntimeConstructorInfo ci && m_handle == ci.m_handle && ReferenceEquals(m_declaringType, ci.m_declaringType);
buyaa-n marked this conversation as resolved.
Show resolved Hide resolved
buyaa-n marked this conversation as resolved.
Show resolved Hide resolved

public override int GetHashCode() => MetadataUpdater.IsSupported ?
HashCode.Combine(RuntimeHelpers.GetHashCodeOfPtr(m_handle), m_declaringType.GetHashCode()) : base.GetHashCode();
public override int GetHashCode() =>
HashCode.Combine(m_handle.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
#endregion

#region ICustomAttributeProvider
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeEventInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ public override bool Equals(object? obj) =>
ReferenceEquals(this, obj) ||
(MetadataUpdater.IsSupported && CacheEquals(obj));

public override int GetHashCode() => MetadataUpdater.IsSupported ?
HashCode.Combine(m_token.GetHashCode(), m_declaringType.GetHashCode()) : base.GetHashCode();
public override int GetHashCode() =>
HashCode.Combine(m_token.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
#endregion

#region ICustomAttributeProvider
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public override bool Equals(object? obj) =>
ReferenceEquals(this, obj) ||
(MetadataUpdater.IsSupported && CacheEquals(obj));

public override int GetHashCode() => MetadataUpdater.IsSupported ?
HashCode.Combine(MetadataToken.GetHashCode(), m_declaringType.GetHashCode()) : base.GetHashCode();
public override int GetHashCode() =>
HashCode.Combine(MetadataToken.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
buyaa-n marked this conversation as resolved.
Show resolved Hide resolved
#endregion

#region Object Overrides
Expand Down
10 changes: 7 additions & 3 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,17 @@ public override string ToString()
return m_toString;
}

public override int GetHashCode() => (MetadataUpdater.IsSupported || IsGenericMethod) ?
HashCode.Combine(RuntimeHelpers.GetHashCodeOfPtr(m_handle), m_declaringType.GetHashCode()) : base.GetHashCode();
// We cannot do simple object identity comparisons due to generic methods.
// Equals and GetHashCode will be called in CerHashTable when RuntimeType+RuntimeTypeCache.GetGenericMethodInfo()
// retrieve items from and insert items into s_methodInstantiations.

public override int GetHashCode() =>
HashCode.Combine(m_handle.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());

public override bool Equals(object? obj) =>
jkotas marked this conversation as resolved.
Show resolved Hide resolved
obj is RuntimeMethodInfo m && m_handle == m.m_handle &&
ReferenceEquals(m_declaringType, m.m_declaringType) &&
ReferenceEquals(ReflectedType, m.ReflectedType);
ReferenceEquals(m_reflectedTypeCache.GetRuntimeType(), m_reflectedTypeCache.GetRuntimeType());
buyaa-n marked this conversation as resolved.
Show resolved Hide resolved

#endregion

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimePropertyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ public override bool Equals(object? obj) =>
ReferenceEquals(this, obj) ||
(MetadataUpdater.IsSupported && CacheEquals(obj));

public override int GetHashCode() => MetadataUpdater.IsSupported ?
HashCode.Combine(m_token.GetHashCode(), m_declaringType.GetHashCode()) : base.GetHashCode();
public override int GetHashCode() =>
HashCode.Combine(m_token.GetHashCode(), m_declaringType.GetUnderlyingNativeHandle().GetHashCode());
#endregion

#region PropertyInfo Overrides
Expand Down