OpenJDK 17: java.util.HashMap (getNode)
This is part of merging upstream changes from OpenJDK 17.0.3-ga. This CL
updates getNode(...) function in java.util.hashMap class.
Bug: 241564190
Test: treehugger
Change-Id: I1575799405453bf9be5b467efdfcdcdf2b45bcc6
diff --git a/ojluni/src/main/java/java/util/HashMap.java b/ojluni/src/main/java/java/util/HashMap.java
index e939c41..22ef836 100644
--- a/ojluni/src/main/java/java/util/HashMap.java
+++ b/ojluni/src/main/java/java/util/HashMap.java
@@ -553,20 +553,19 @@
*/
public V get(Object key) {
Node<K,V> e;
- return (e = getNode(hash(key), key)) == null ? null : e.value;
+ return (e = getNode(key)) == null ? null : e.value;
}
/**
* Implements Map.get and related methods.
*
- * @param hash hash for key
* @param key the key
* @return the node, or null if none
*/
- final Node<K,V> getNode(int hash, Object key) {
- Node<K,V>[] tab; Node<K,V> first, e; int n; K k;
+ final Node<K,V> getNode(Object key) {
+ Node<K,V>[] tab; Node<K,V> first, e; int n, hash; K k;
if ((tab = table) != null && (n = tab.length) > 0 &&
- (first = tab[(n - 1) & hash]) != null) {
+ (first = tab[(n - 1) & (hash = hash(key))]) != null) {
if (first.hash == hash && // always check first node
((k = first.key) == key || (key != null && key.equals(k))))
return first;
@@ -592,7 +591,7 @@
* key.
*/
public boolean containsKey(Object key) {
- return getNode(hash(key), key) != null;
+ return getNode(key) != null;
}
/**
@@ -1019,7 +1018,7 @@
return false;
Map.Entry<?,?> e = (Map.Entry<?,?>) o;
Object key = e.getKey();
- Node<K,V> candidate = getNode(hash(key), key);
+ Node<K,V> candidate = getNode(key);
return candidate != null && candidate.equals(e);
}
public final boolean remove(Object o) {
@@ -1056,7 +1055,7 @@
@Override
public V getOrDefault(Object key, V defaultValue) {
Node<K,V> e;
- return (e = getNode(hash(key), key)) == null ? defaultValue : e.value;
+ return (e = getNode(key)) == null ? defaultValue : e.value;
}
@Override
@@ -1072,7 +1071,7 @@
@Override
public boolean replace(K key, V oldValue, V newValue) {
Node<K,V> e; V v;
- if ((e = getNode(hash(key), key)) != null &&
+ if ((e = getNode(key)) != null &&
((v = e.value) == oldValue || (v != null && v.equals(oldValue)))) {
e.value = newValue;
afterNodeAccess(e);
@@ -1084,7 +1083,7 @@
@Override
public V replace(K key, V value) {
Node<K,V> e;
- if ((e = getNode(hash(key), key)) != null) {
+ if ((e = getNode(key)) != null) {
V oldValue = e.value;
e.value = value;
afterNodeAccess(e);
@@ -1152,8 +1151,7 @@
if (remappingFunction == null)
throw new NullPointerException();
Node<K,V> e; V oldValue;
- int hash = hash(key);
- if ((e = getNode(hash, key)) != null &&
+ if ((e = getNode(key)) != null &&
(oldValue = e.value) != null) {
V v = remappingFunction.apply(key, oldValue);
if (v != null) {
@@ -1161,8 +1159,10 @@
afterNodeAccess(e);
return v;
}
- else
+ else {
+ int hash = hash(key);
removeNode(hash, key, null, false, true);
+ }
}
return null;
}
diff --git a/ojluni/src/main/java/java/util/LinkedHashMap.java b/ojluni/src/main/java/java/util/LinkedHashMap.java
index 376f40f..35bdfd6 100644
--- a/ojluni/src/main/java/java/util/LinkedHashMap.java
+++ b/ojluni/src/main/java/java/util/LinkedHashMap.java
@@ -461,7 +461,7 @@
*/
public V get(Object key) {
Node<K,V> e;
- if ((e = getNode(hash(key), key)) == null)
+ if ((e = getNode(key)) == null)
return null;
if (accessOrder)
afterNodeAccess(e);
@@ -473,7 +473,7 @@
*/
public V getOrDefault(Object key, V defaultValue) {
Node<K,V> e;
- if ((e = getNode(hash(key), key)) == null)
+ if ((e = getNode(key)) == null)
return defaultValue;
if (accessOrder)
afterNodeAccess(e);
@@ -684,7 +684,7 @@
return false;
Map.Entry<?,?> e = (Map.Entry<?,?>) o;
Object key = e.getKey();
- Node<K,V> candidate = getNode(hash(key), key);
+ Node<K,V> candidate = getNode(key);
return candidate != null && candidate.equals(e);
}
public final boolean remove(Object o) {
