archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8330681: Explicit hashCode and equals for java.lang.runtime.SwitchBootstraps$TypePairs

Browse source 
Reviewed-by: jlahoda, mchung
This commit is contained in:
Claes Redestad 2024-04-22 08:54:29 +00:00
parent 5313dcc8f9
commit 3d62bbf4f2
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
View file

@ -82,8 +82,6 @@ public class SwitchBootstraps {
private static final MethodTypeDesc TYPES_SWITCH_DESCRIPTOR =
MethodTypeDesc.ofDescriptor("(Ljava/lang/Object;ILjava/util/function/BiPredicate;Ljava/util/List;)I");
private static final Map<TypePairs, String> typePairToName;
static {
try {
NULL_CHECK = LOOKUP.findStatic(Objects.class, "isNull",
@ -99,7 +97,6 @@ public class SwitchBootstraps {
catch (ReflectiveOperationException e) {
throw new ExceptionInInitializerError(e);
}
typePairToName = TypePairs.initialize();
}
/**
@ -507,7 +504,7 @@ public class SwitchBootstraps {
}
TypePairs typePair = TypePairs.of(Wrapper.asPrimitiveType(selectorType), classLabel);
String methodName = typePairToName.get(typePair);
String methodName = TypePairs.typePairToName.get(typePair);
cb.invokestatic(ExactConversionsSupport.class.describeConstable().orElseThrow(),
methodName,
MethodTypeDesc.of(ConstantDescs.CD_boolean, typePair.from.describeConstable().orElseThrow()));
@ -684,6 +681,9 @@ public class SwitchBootstraps {
// TypePairs should be in sync with the corresponding record in Lower
record TypePairs(Class<?> from, Class<?> to) {
private static final Map<TypePairs, String> typePairToName = initialize();
public static TypePairs of(Class<?> from, Class<?> to) {
if (from == byte.class || from == short.class || from == char.class) {
from = int.class;
@ -691,6 +691,17 @@ public class SwitchBootstraps {
return new TypePairs(from, to);
}
public int hashCode() {
return 31 * from.hashCode() + to.hashCode();
}
public boolean equals(Object other) {
if (other instanceof TypePairs otherPair) {
return otherPair.from == from && otherPair.to == to;
}
return false;
}
public static Map<TypePairs, String> initialize() {
Map<TypePairs, String> typePairToName = new HashMap<>();
typePairToName.put(new TypePairs(byte.class, char.class), "isIntToCharExact"); // redirected