[JDK-8343584] Array types are considered non-abstract.

PullRequest: graal/19224

Author: mur47x111

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotCompressedKlassPointerTest.java

@@ -59,12 +59,27 @@ public static boolean instanceOfComparable(Object o) {
         return o instanceof Comparable;
     }
 
+    // Array of non-abstract class
+    public static boolean instanceOfIntegerArray(Object o) {
+        return o instanceof Integer[];
+    }
+
+    // Array of abstract class
+    public static boolean instanceOfNumberArray(Object o) {
+        return o instanceof Number[];
+    }
+
+    // Array of interface
+    public static boolean instanceOfComparableArray(Object o) {
+        return o instanceof Comparable[];
+    }
+
     private void assertNoCompressedInterfaceOrAbstractClassConstant(String methodName) {
         StructuredGraph graph = getFinalGraph(methodName);
         for (ConstantNode constantNode : graph.getNodes().filter(ConstantNode.class)) {
             if (constantNode.asConstant() instanceof HotSpotMetaspaceConstant mc && mc.isCompressed()) {
                 ResolvedJavaType type = mc.asResolvedJavaType();
-                assertFalse(type.isInterface() || type.isAbstract(), "As of JDK-8338526, interface and abstract types are not compressible.");
+                assertFalse(!type.isArray() && (type.isInterface() || type.isAbstract()), "As of JDK-8338526, interface and abstract types are not compressible.");
             }
         }
     }
@@ -74,5 +89,8 @@ public void testInstanceOf() {
         assertNoCompressedInterfaceOrAbstractClassConstant("instanceOfInteger");
         assertNoCompressedInterfaceOrAbstractClassConstant("instanceOfNumber");
         assertNoCompressedInterfaceOrAbstractClassConstant("instanceOfComparable");
+        assertNoCompressedInterfaceOrAbstractClassConstant("instanceOfIntegerArray");
+        assertNoCompressedInterfaceOrAbstractClassConstant("instanceOfNumberArray");
+        assertNoCompressedInterfaceOrAbstractClassConstant("instanceOfComparableArray");
     }
 }

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/SecondarySupersLookupTest.java

@@ -273,4 +273,29 @@ public void testHashCollision() {
         test("instanceOfI34", obj60);
         test("instanceOfI60", obj08);
     }
+
+    public static boolean instanceOfI08Array(Object o) {
+        return o instanceof I08[];
+    }
+
+    public static boolean instanceOfI34Array(Object o) {
+        return o instanceof I08[];
+    }
+
+    public static boolean instanceOfI60Array(Object o) {
+        return o instanceof I08[];
+    }
+
+    @Test
+    public void testInterfaceArray() {
+        Object i08 = new I08[0];
+        test("instanceOfI08Array", i08);
+        test("instanceOfI34Array", i08);
+        test("instanceOfI60Array", i08);
+
+        Object i60 = new I60[0];
+        test("instanceOfI08Array", i60);
+        test("instanceOfI34Array", i60);
+        test("instanceOfI60Array", i60);
+    }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotCompressionNode.java

@@ -77,7 +77,7 @@ public boolean isCompressible(Constant constant) {
         if (JavaVersionUtil.JAVA_SPEC >= 24 && constant instanceof HotSpotMetaspaceConstant mc) {
             ResolvedJavaType type = mc.asResolvedJavaType();
             // As of JDK-8338526, interface and abstract types are not compressible.
-            return !type.isAbstract() && !type.isInterface();
+            return type.isArray() || (!type.isAbstract() && !type.isInterface());
         }
         return true;
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/InstanceOfSnippets.java

@@ -313,7 +313,7 @@ protected Arguments makeArguments(InstanceOfUsageReplacer replacer, LoweringTool
                     args.add("object", object);
                     args.addVarargs("hints", KlassPointer.class, KlassPointerStamp.klassNonNull(), hints.hubs);
                     args.addVarargs("hintIsPositive", boolean.class, StampFactory.forKind(JavaKind.Boolean), hints.isPositive);
-                    args.addConst("isHubAbstract", type.isAbstract() || type.isInterface());
+                    args.addConst("isHubAbstract", !type.isArray() && (type.isAbstract() || type.isInterface()));
                 }
                 args.add("trueValue", replacer.trueValue);
                 args.add("falseValue", replacer.falseValue);