test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java

@@ -325,10 +325,11 @@
             if (expected == null) {
                 assertNull(leafConcreteSubtype);
             } else {
                 assertTrue(leafConcreteSubtype.getResult().equals(expected));
             }
+            assertTrue(!type.isLeaf() || leafConcreteSubtype.isAssumptionFree());
         }
 
         if (!type.isArray()) {
             ResolvedJavaType arrayType = type.getArrayClass();
             AssumptionResult<ResolvedJavaType> arraySubtype = arrayType.findLeafConcreteSubtype();

@@ -369,12 +370,14 @@
         checkConcreteSubtype(c3, null);
         checkConcreteSubtype(a4, null);
 
         ResolvedJavaType a1a = metaAccess.lookupJavaType(Abstract1[].class);
         checkConcreteSubtype(a1a, null);
+        ResolvedJavaType i1a = metaAccess.lookupJavaType(Interface1[].class);
+        checkConcreteSubtype(i1a, null);
         ResolvedJavaType c1a = metaAccess.lookupJavaType(Concrete1[].class);
-        checkConcreteSubtype(c1a, null);
+        checkConcreteSubtype(c1a, c1a);
         ResolvedJavaType f1a = metaAccess.lookupJavaType(Final1[].class);
         checkConcreteSubtype(f1a, f1a);
 
         ResolvedJavaType obja = metaAccess.lookupJavaType(Object[].class);
         checkConcreteSubtype(obja, null);