Skip to content

8373930: [lworld] Restore Objects.equals use of identity check #1836

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

Open
RogerRiggs wants to merge 1 commit into
base: lworld
Choose a base branch
from
+4 −10
Open

8373930: [lworld] Restore Objects.equals use of identity check #1836

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
8 changes: 1 addition & 7 deletions src/java.base/share/classes/java/util/Objects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
package java.util;

import jdk.internal.javac.PreviewFeature;
import jdk.internal.misc.PreviewFeatures;
import jdk.internal.util.Preconditions;
import jdk.internal.vm.annotation.ForceInline;

Expand Down Expand Up @@ -62,12 +61,7 @@ private Objects() {
*/
@ForceInline
public static boolean equals(Object a, Object b) {
if (PreviewFeatures.isEnabled()) {
// With --enable-preview avoid acmp
return (a == null) ? b == null : a.equals(b);
} else {
return (a == b) || (a != null && a.equals(b));
}
return (a == b) || (a != null && a.equals(b));
}

/**
Expand Down
6 changes: 3 additions & 3 deletions test/jdk/java/io/Serializable/valueObjects/SimpleValueGraphs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,9 @@ public SimpleValue(Serializable o, int i) {
this.i = i;
}

public boolean equals(Object obj) {
if (obj instanceof SimpleValue simpleValue) {
return (i == simpleValue.i && Objects.equals(this.obj, simpleValue.obj));
public boolean equals(Object other) {
if (other instanceof SimpleValue simpleValue) {
return (i == simpleValue.i && Objects.equals(obj, simpleValue.obj));
}
return false;
}
Expand Down