Provide JVMCI types for different array layouts.

Author: MichaelHaas99

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

@@ -728,20 +728,18 @@ C2V_VMENTRY_NULL(jobject, getArrayType, (JNIEnv* env, jobject, jchar type_char,
       JVMCI_THROW_MSG_NULL(InternalError, err_msg("No array klass for primitive type %s", type2name(type)));
     }
   } else {
-    if (klass->is_inline_klass() && vm_type) {
-        InlineKlass* vk = InlineKlass::cast(klass);
+    ArrayKlass* ak = klass->array_klass(THREAD);
+    array_klass = ak;
+    if (vm_type) {
         ArrayKlass::ArrayProperties props = ArrayKlass::ArrayProperties::DEFAULT;
         if (null_restricted) {
           props = (ArrayKlass::ArrayProperties)(props | ArrayKlass::ArrayProperties::NULL_RESTRICTED);
         }
         if (!atomic) {
           props = (ArrayKlass::ArrayProperties)(props | ArrayKlass::ArrayProperties::NON_ATOMIC);
         }
-        ArrayKlass* ak = vk->array_klass(THREAD);
+        ArrayKlass* ak = klass->array_klass(THREAD);
         array_klass = ObjArrayKlass::cast(ak)->klass_with_properties(props, THREAD);
-    } else {
-      ArrayKlass* ak = klass->array_klass(THREAD);
-      array_klass = ObjArrayKlass::cast(ak)->klass_with_properties(ArrayKlass::ArrayProperties::DEFAULT, THREAD);
     }
   }
   JVMCIObject result = JVMCIENV->get_jvmci_type(array_klass, JVMCI_CHECK_NULL);

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java

@@ -31,7 +31,8 @@
 public abstract class HotSpotResolvedJavaType extends HotSpotJavaType implements ResolvedJavaType {
 
     HotSpotResolvedObjectType arrayOfType;
-    HotSpotResolvedObjectType flatArrayOfType;
+    HotSpotResolvedObjectType nullRestrictedAtomicArrayOfType;
+    HotSpotResolvedObjectType nullRestrictedNonAtomicArrayOfType;
 
     protected HotSpotResolvedJavaType(String name) {
         super(name);
@@ -58,11 +59,25 @@ public int hashCode() {
     @Override
     public HotSpotResolvedObjectType getArrayClass() {
         if (arrayOfType == null) {
-            arrayOfType = getArrayType(false, false, false);
+            arrayOfType = getArrayType(true, false, true);
         }
         return arrayOfType;
     }
 
+    public HotSpotResolvedObjectType nullRestrictedAtomicArrayClass() {
+        if (nullRestrictedAtomicArrayOfType == null) {
+            nullRestrictedAtomicArrayOfType = getArrayType(true, true, true);
+        }
+        return nullRestrictedAtomicArrayOfType;
+    }
+
+    public HotSpotResolvedObjectType getNullRestrictedNonAtomicArrayClass() {
+        if (nullRestrictedNonAtomicArrayOfType == null) {
+            nullRestrictedNonAtomicArrayOfType = getArrayType(false, true, true);
+        }
+        return nullRestrictedNonAtomicArrayOfType;
+    }
+
     /**
      * Checks whether this type is currently being initialized. If a type is being initialized it
      * implies that it was {@link #isLinked() linked} and that the static initializer is currently