Skip to content

8356605: JRSUIControl.hashCode and JRSUIState.hashCode can use Long.hashCode #24989

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

Closed
wenshao wants to merge 1 commit into from
Closed

8356605: JRSUIControl.hashCode and JRSUIState.hashCode can use Long.hashCode #24989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ private void sync() {

@Override
public int hashCode() {
int bits = (int)(currentEncodedProperties ^ (currentEncodedProperties >>> 32));
int bits = Long.hashCode(currentEncodedProperties);
bits ^= nativeMap.hashCode();
bits ^= changes.hashCode();
return bits;
Expand Down
7 changes: 3 additions & 4 deletions src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public boolean is(Property property) {

@Override
public int hashCode() {
return (int)(encodedState ^ (encodedState >>> 32)) ^ getClass().hashCode();
return Long.hashCode(encodedState) ^ getClass().hashCode();
}

public static class AnimationFrameState extends JRSUIState {
Expand Down Expand Up @@ -183,8 +183,7 @@ public boolean equals(final Object obj) {

@Override
public int hashCode() {
final long bits = Double.doubleToRawLongBits(value);
return super.hashCode() ^ (int)bits ^ (int)(bits >>> 32);
return super.hashCode() ^ Double.hashCode(value);
Copy link
Contributor

@prrace prrace May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this uses Double.hashCode() not Long.hashCode() it would have been nice to have some comments on that. It took a bit of reading and following to learn that Double.hashCode() first uses Double.doubleToRawLongBits and then calls out to Long.hashCode

Copy link
Contributor Author

@wenshao wenshao May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double.hashCode is a simple call, and there are no comments in other places where Double.hashCode is used in the JDK source code.

}
}

Expand Down Expand Up @@ -258,7 +257,7 @@ public boolean equals(final Object obj) {
@Override
public int hashCode() {
final long bits = Double.doubleToRawLongBits(thumbProportion) ^ Double.doubleToRawLongBits(thumbStart);
return super.hashCode() ^ (int)bits ^ (int)(bits >>> 32);
return super.hashCode() ^ Long.hashCode(bits);
}
}
}