8335060: ClassCastException after JDK-8294960

Reviewed-by: liach, jpai
dfuch · Jul 1, 2024 · 3ca2bcd · 3ca2bcd
1 parent 747e1e4
commit 3ca2bcd
Show file tree

Hide file tree

Showing 2 changed files with 806 additions and 8 deletions.
diff --git a/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java b/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
@@ -69,14 +69,14 @@ private static MethodRefEntry unbox(ClassDesc owner, String methodName, ClassDes
     }
 
     private static TypeKind primitiveTypeKindFromClass(Class<?> type) {
-        if (type == int.class)     return TypeKind.IntType;
-        if (type == long.class)    return TypeKind.LongType;
-        if (type == boolean.class) return TypeKind.BooleanType;
-        if (type == short.class)   return TypeKind.ShortType;
-        if (type == byte.class)    return TypeKind.ByteType;
-        if (type == char.class)    return TypeKind.CharType;
-        if (type == float.class)   return TypeKind.FloatType;
-        if (type == double.class)  return TypeKind.DoubleType;
+        if (type == Integer.class)   return TypeKind.IntType;
+        if (type == Long.class)      return TypeKind.LongType;
+        if (type == Boolean.class)   return TypeKind.BooleanType;
+        if (type == Short.class)     return TypeKind.ShortType;
+        if (type == Byte.class)      return TypeKind.ByteType;
+        if (type == Character.class) return TypeKind.CharType;
+        if (type == Float.class)     return TypeKind.FloatType;
+        if (type == Double.class)    return TypeKind.DoubleType;
         return null;
     }