< prev index next >

src/hotspot/share/oops/objArrayKlass.cpp

Print this page
*** 20,43 ***
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
  #include "classfile/moduleEntry.hpp"
  #include "classfile/packageEntry.hpp"
  #include "classfile/symbolTable.hpp"
  #include "classfile/vmClasses.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "memory/iterator.inline.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "oops/arrayKlass.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/klass.inline.hpp"
  #include "oops/objArrayKlass.inline.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/symbol.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "utilities/macros.hpp"
  
! ObjArrayKlass* ObjArrayKlass::allocate_klass(ClassLoaderData* loader_data, int n, Klass* k, Symbol* name, TRAPS) {
    assert(ObjArrayKlass::header_size() <= InstanceKlass::header_size(),
        "array klasses must be same size as InstanceKlass");
  
    int size = ArrayKlass::static_size(ObjArrayKlass::header_size());
  
!   return new (loader_data, size, THREAD) ObjArrayKlass(n, k, name);
  }
  
  ObjArrayKlass* ObjArrayKlass::allocate_objArray_klass(ClassLoaderData* loader_data,
!                                                       int n, Klass* element_klass, TRAPS) {
  
    // Eagerly allocate the direct array supertype.
    Klass* super_klass = nullptr;
    if (!Universe::is_bootstrapping() || vmClasses::Object_klass_loaded()) {
      assert(MultiArray_lock->holds_lock(THREAD), "must hold lock after bootstrapping");
--- 20,51 ---
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
+ #include "cds/cdsConfig.hpp"
  #include "classfile/moduleEntry.hpp"
  #include "classfile/packageEntry.hpp"
  #include "classfile/symbolTable.hpp"
  #include "classfile/vmClasses.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "memory/iterator.inline.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceClosure.hpp"
+ #include "memory/oopFactory.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "oops/arrayKlass.hpp"
+ #include "oops/flatArrayKlass.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/klass.inline.hpp"
+ #include "oops/markWord.hpp"
  #include "oops/objArrayKlass.inline.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
+ #include "oops/refArrayKlass.hpp"
  #include "oops/symbol.hpp"
+ #include "runtime/arguments.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "utilities/macros.hpp"
  
! ObjArrayKlass* ObjArrayKlass::allocate_klass(ClassLoaderData* loader_data, int n,
+                                        Klass* k, Symbol* name, ArrayKlass::ArrayProperties props,
+                                        TRAPS) {
    assert(ObjArrayKlass::header_size() <= InstanceKlass::header_size(),
        "array klasses must be same size as InstanceKlass");
  
    int size = ArrayKlass::static_size(ObjArrayKlass::header_size());
  
!   return new (loader_data, size, THREAD) ObjArrayKlass(n, k, name, Kind, props, ArrayKlass::is_null_restricted(props) ? markWord::null_free_array_prototype() : markWord::prototype());
  }
  
  ObjArrayKlass* ObjArrayKlass::allocate_objArray_klass(ClassLoaderData* loader_data,
!                                                       int n, Klass* element_klass,  TRAPS) {
  
    // Eagerly allocate the direct array supertype.
    Klass* super_klass = nullptr;
    if (!Universe::is_bootstrapping() || vmClasses::Object_klass_loaded()) {
      assert(MultiArray_lock->holds_lock(THREAD), "must hold lock after bootstrapping");

*** 77,32 ***
        super_klass = vmClasses::Object_klass();
      }
    }
  
    // Create type name for klass.
!   Symbol* name = nullptr;
-   {
-     ResourceMark rm(THREAD);
-     char *name_str = element_klass->name()->as_C_string();
-     int len = element_klass->name()->utf8_length();
-     char *new_str = NEW_RESOURCE_ARRAY(char, len + 4);
-     int idx = 0;
-     new_str[idx++] = JVM_SIGNATURE_ARRAY;
-     if (element_klass->is_instance_klass()) { // it could be an array or simple type
-       new_str[idx++] = JVM_SIGNATURE_CLASS;
-     }
-     memcpy(&new_str[idx], name_str, len * sizeof(char));
-     idx += len;
-     if (element_klass->is_instance_klass()) {
-       new_str[idx++] = JVM_SIGNATURE_ENDCLASS;
-     }
-     new_str[idx++] = '\0';
-     name = SymbolTable::new_symbol(new_str);
-   }
  
    // Initialize instance variables
!   ObjArrayKlass* oak = ObjArrayKlass::allocate_klass(loader_data, n, element_klass, name, CHECK_NULL);
  
    ModuleEntry* module = oak->module();
    assert(module != nullptr, "No module entry for array");
  
    // Call complete_create_array_klass after all instance variables has been initialized.
--- 85,14 ---
        super_klass = vmClasses::Object_klass();
      }
    }
  
    // Create type name for klass.
!   Symbol* name = ArrayKlass::create_element_klass_array_name(element_klass, CHECK_NULL);
  
    // Initialize instance variables
!   ObjArrayKlass* oak = ObjArrayKlass::allocate_klass(loader_data, n, element_klass, name, ArrayProperties::INVALID, CHECK_NULL);
  
    ModuleEntry* module = oak->module();
    assert(module != nullptr, "No module entry for array");
  
    // Call complete_create_array_klass after all instance variables has been initialized.

*** 116,58 ***
    loader_data->add_class(oak);
  
    return oak;
  }
  
! ObjArrayKlass::ObjArrayKlass(int n, Klass* element_klass, Symbol* name) : ArrayKlass(name, Kind) {
    set_dimension(n);
    set_element_klass(element_klass);
  
    Klass* bk;
    if (element_klass->is_objArray_klass()) {
      bk = ObjArrayKlass::cast(element_klass)->bottom_klass();
    } else {
      bk = element_klass;
    }
    assert(bk != nullptr && (bk->is_instance_klass() || bk->is_typeArray_klass()), "invalid bottom klass");
    set_bottom_klass(bk);
    set_class_loader_data(bk->class_loader_data());
  
    if (element_klass->is_array_klass()) {
      set_lower_dimension(ArrayKlass::cast(element_klass));
    }
  
!   set_layout_helper(array_layout_helper(T_OBJECT));
    assert(is_array_klass(), "sanity");
    assert(is_objArray_klass(), "sanity");
  }
  
  size_t ObjArrayKlass::oop_size(oop obj) const {
    // In this assert, we cannot safely access the Klass* with compact headers,
    // because size_given_klass() calls oop_size() on objects that might be
    // concurrently forwarded, which would overwrite the Klass*.
    assert(UseCompactObjectHeaders || obj->is_objArray(), "must be object array");
!   return objArrayOop(obj)->object_size();
  }
  
! objArrayOop ObjArrayKlass::allocate_instance(int length, TRAPS) {
    check_array_allocation_length(length, arrayOopDesc::max_array_length(T_OBJECT), CHECK_NULL);
!   size_t size = objArrayOopDesc::object_size(length);
!   return (objArrayOop)Universe::heap()->array_allocate(this, size, length,
!                                                        /* do_zero */ true, THREAD);
  }
  
  oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
    int length = *sizes;
    ArrayKlass* ld_klass = lower_dimension();
    // If length < 0 allocate will throw an exception.
!   objArrayOop array = allocate_instance(length, CHECK_NULL);
    objArrayHandle h_array (THREAD, array);
    if (rank > 1) {
      if (length != 0) {
        for (int index = 0; index < length; index++) {
!         oop sub_array = ld_klass->multi_allocate(rank - 1, &sizes[1], CHECK_NULL);
          h_array->obj_at_put(index, sub_array);
        }
      } else {
        // Since this array dimension has zero length, nothing will be
        // allocated, however the lower dimension values must be checked
--- 106,125 ---
    loader_data->add_class(oak);
  
    return oak;
  }
  
! ObjArrayKlass::ObjArrayKlass(int n, Klass* element_klass, Symbol* name, KlassKind kind, ArrayKlass::ArrayProperties props, markWord mk) :
+ ArrayKlass(name, kind, props, mk) {
    set_dimension(n);
    set_element_klass(element_klass);
+   set_next_refined_klass_klass(nullptr);
+   set_properties(props);
  
    Klass* bk;
    if (element_klass->is_objArray_klass()) {
      bk = ObjArrayKlass::cast(element_klass)->bottom_klass();
    } else {
+     assert(!element_klass->is_refArray_klass(), "Sanity");
      bk = element_klass;
    }
    assert(bk != nullptr && (bk->is_instance_klass() || bk->is_typeArray_klass()), "invalid bottom klass");
    set_bottom_klass(bk);
    set_class_loader_data(bk->class_loader_data());
  
    if (element_klass->is_array_klass()) {
      set_lower_dimension(ArrayKlass::cast(element_klass));
    }
  
!   int lh = array_layout_helper(T_OBJECT);
+   if (ArrayKlass::is_null_restricted(props)) {
+     assert(n == 1, "Bytecode does not support null-free multi-dim");
+     lh = layout_helper_set_null_free(lh);
+ #ifdef _LP64
+     assert(prototype_header().is_null_free_array(), "sanity");
+ #endif
+   }
+   set_layout_helper(lh);
    assert(is_array_klass(), "sanity");
    assert(is_objArray_klass(), "sanity");
  }
  
  size_t ObjArrayKlass::oop_size(oop obj) const {
    // In this assert, we cannot safely access the Klass* with compact headers,
    // because size_given_klass() calls oop_size() on objects that might be
    // concurrently forwarded, which would overwrite the Klass*.
    assert(UseCompactObjectHeaders || obj->is_objArray(), "must be object array");
!   // return objArrayOop(obj)->object_size();
+   return obj->is_flatArray() ? flatArrayOop(obj)->object_size(layout_helper()) : refArrayOop(obj)->object_size();
  }
  
! ArrayDescription ObjArrayKlass::array_layout_selection(Klass* element, ArrayProperties properties) {
+   // TODO FIXME: the layout selection should take the array size in consideration
+   // to avoid creation of arrays too big to be handled by the VM. See JDK-8233189
+   if (!UseArrayFlattening || element->is_array_klass() || element->is_identity_class() || element->is_abstract()) {
+     return ArrayDescription(RefArrayKlassKind, properties, LayoutKind::REFERENCE);
+   }
+   assert(element->is_final(), "Flat layouts below require monomorphic elements");
+   InlineKlass* vk = InlineKlass::cast(element);
+   if (is_null_restricted(properties)) {
+     if (is_non_atomic(properties)) {
+       // Null-restricted + non-atomic
+       if (vk->maybe_flat_in_array() && vk->has_non_atomic_layout()) {
+         return ArrayDescription(FlatArrayKlassKind, properties, LayoutKind::NON_ATOMIC_FLAT);
+       } else {
+         return ArrayDescription(RefArrayKlassKind, properties, LayoutKind::REFERENCE);
+       }
+     } else {
+       // Null-restricted + atomic
+       if (vk->maybe_flat_in_array() && vk->is_naturally_atomic() && vk->has_non_atomic_layout()) {
+         return ArrayDescription(FlatArrayKlassKind, properties, LayoutKind::NON_ATOMIC_FLAT);
+       } else if (vk->maybe_flat_in_array() && vk->has_atomic_layout()) {
+         return ArrayDescription(FlatArrayKlassKind, properties, LayoutKind::ATOMIC_FLAT);
+       } else {
+         return ArrayDescription(RefArrayKlassKind, properties, LayoutKind::REFERENCE);
+       }
+     }
+   } else {
+     // nullable implies atomic, so the non-atomic property is ignored
+     if (vk->maybe_flat_in_array() && vk->has_nullable_atomic_layout()) {
+       return ArrayDescription(FlatArrayKlassKind, properties, LayoutKind::NULLABLE_ATOMIC_FLAT);
+     } else {
+       return ArrayDescription(RefArrayKlassKind, properties, LayoutKind::REFERENCE);
+     }
+   }
+ }
+ 
+ objArrayOop ObjArrayKlass::allocate_instance(int length, ArrayProperties props, TRAPS) {
    check_array_allocation_length(length, arrayOopDesc::max_array_length(T_OBJECT), CHECK_NULL);
!   ObjArrayKlass* ak = klass_with_properties(props, THREAD);
!   size_t size = 0;
!   switch(ak->kind()) {
+     case Klass::RefArrayKlassKind:
+       size = refArrayOopDesc::object_size(length);
+       break;
+     case Klass::FlatArrayKlassKind:
+       size = flatArrayOopDesc::object_size(ak->layout_helper(), length);
+       break;
+     default:
+       ShouldNotReachHere();
+   }
+   assert(size != 0, "Sanity check");
+   objArrayOop array = (objArrayOop)Universe::heap()->array_allocate(
+     ak, size, length,
+     /* do_zero */ true, CHECK_NULL);
+   assert(array->is_refArray() || array->is_flatArray(), "Must be");
+   objArrayHandle array_h(THREAD, array);
+   return array_h();
  }
  
  oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
    int length = *sizes;
    ArrayKlass* ld_klass = lower_dimension();
    // If length < 0 allocate will throw an exception.
!   ObjArrayKlass* oak = klass_with_properties(ArrayProperties::DEFAULT, CHECK_NULL);
+   assert(oak->is_refArray_klass() || oak->is_flatArray_klass(), "Must be");
+   objArrayOop array = oak->allocate_instance(length, ArrayProperties::DEFAULT, CHECK_NULL);
    objArrayHandle h_array (THREAD, array);
    if (rank > 1) {
      if (length != 0) {
        for (int index = 0; index < length; index++) {
!         oop sub_array = ld_klass->multi_allocate(rank-1, &sizes[1], CHECK_NULL);
          h_array->obj_at_put(index, sub_array);
        }
      } else {
        // Since this array dimension has zero length, nothing will be
        // allocated, however the lower dimension values must be checked

*** 181,118 ***
      }
    }
    return h_array();
  }
  
- // Either oop or narrowOop depending on UseCompressedOops.
- void ObjArrayKlass::do_copy(arrayOop s, size_t src_offset,
-                             arrayOop d, size_t dst_offset, int length, TRAPS) {
-   if (s == d) {
-     // since source and destination are equal we do not need conversion checks.
-     assert(length > 0, "sanity check");
-     ArrayAccess<>::oop_arraycopy(s, src_offset, d, dst_offset, length);
-   } else {
-     // We have to make sure all elements conform to the destination array
-     Klass* bound = ObjArrayKlass::cast(d->klass())->element_klass();
-     Klass* stype = ObjArrayKlass::cast(s->klass())->element_klass();
-     if (stype == bound || stype->is_subtype_of(bound)) {
-       // elements are guaranteed to be subtypes, so no check necessary
-       ArrayAccess<ARRAYCOPY_DISJOINT>::oop_arraycopy(s, src_offset, d, dst_offset, length);
-     } else {
-       // slow case: need individual subtype checks
-       // note: don't use obj_at_put below because it includes a redundant store check
-       if (!ArrayAccess<ARRAYCOPY_DISJOINT | ARRAYCOPY_CHECKCAST>::oop_arraycopy(s, src_offset, d, dst_offset, length)) {
-         ResourceMark rm(THREAD);
-         stringStream ss;
-         if (!bound->is_subtype_of(stype)) {
-           ss.print("arraycopy: type mismatch: can not copy %s[] into %s[]",
-                    stype->external_name(), bound->external_name());
-         } else {
-           // oop_arraycopy should return the index in the source array that
-           // contains the problematic oop.
-           ss.print("arraycopy: element type mismatch: can not cast one of the elements"
-                    " of %s[] to the type of the destination array, %s",
-                    stype->external_name(), bound->external_name());
-         }
-         THROW_MSG(vmSymbols::java_lang_ArrayStoreException(), ss.as_string());
-       }
-     }
-   }
- }
- 
  void ObjArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d,
                                 int dst_pos, int length, TRAPS) {
    assert(s->is_objArray(), "must be obj array");
  
!   if (!d->is_objArray()) {
!     ResourceMark rm(THREAD);
!     stringStream ss;
!     if (d->is_typeArray()) {
-       ss.print("arraycopy: type mismatch: can not copy object array[] into %s[]",
-                type2name_tab[ArrayKlass::cast(d->klass())->element_type()]);
-     } else {
-       ss.print("arraycopy: destination type %s is not an array", d->klass()->external_name());
-     }
-     THROW_MSG(vmSymbols::java_lang_ArrayStoreException(), ss.as_string());
-   }
- 
-   // Check is all offsets and lengths are non negative
-   if (src_pos < 0 || dst_pos < 0 || length < 0) {
-     // Pass specific exception reason.
-     ResourceMark rm(THREAD);
-     stringStream ss;
-     if (src_pos < 0) {
-       ss.print("arraycopy: source index %d out of bounds for object array[%d]",
-                src_pos, s->length());
-     } else if (dst_pos < 0) {
-       ss.print("arraycopy: destination index %d out of bounds for object array[%d]",
-                dst_pos, d->length());
-     } else {
-       ss.print("arraycopy: length %d is negative", length);
      }
!     THROW_MSG(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), ss.as_string());
!   }
!   // Check if the ranges are valid
-   if ((((unsigned int) length + (unsigned int) src_pos) > (unsigned int) s->length()) ||
-       (((unsigned int) length + (unsigned int) dst_pos) > (unsigned int) d->length())) {
-     // Pass specific exception reason.
-     ResourceMark rm(THREAD);
-     stringStream ss;
-     if (((unsigned int) length + (unsigned int) src_pos) > (unsigned int) s->length()) {
-       ss.print("arraycopy: last source index %u out of bounds for object array[%d]",
-                (unsigned int) length + (unsigned int) src_pos, s->length());
-     } else {
-       ss.print("arraycopy: last destination index %u out of bounds for object array[%d]",
-                (unsigned int) length + (unsigned int) dst_pos, d->length());
      }
-     THROW_MSG(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), ss.as_string());
    }
  
!   // Special case. Boundary cases must be checked first
!   // This allows the following call: copy_array(s, s.length(), d.length(), 0).
-   // This is correct, since the position is supposed to be an 'in between point', i.e., s.length(),
-   // points to the right of the last element.
-   if (length==0) {
-     return;
-   }
-   if (UseCompressedOops) {
-     size_t src_offset = (size_t) objArrayOopDesc::obj_at_offset<narrowOop>(src_pos);
-     size_t dst_offset = (size_t) objArrayOopDesc::obj_at_offset<narrowOop>(dst_pos);
-     assert(arrayOopDesc::obj_offset_to_raw<narrowOop>(s, src_offset, nullptr) ==
-            objArrayOop(s)->obj_at_addr<narrowOop>(src_pos), "sanity");
-     assert(arrayOopDesc::obj_offset_to_raw<narrowOop>(d, dst_offset, nullptr) ==
-            objArrayOop(d)->obj_at_addr<narrowOop>(dst_pos), "sanity");
-     do_copy(s, src_offset, d, dst_offset, length, CHECK);
-   } else {
-     size_t src_offset = (size_t) objArrayOopDesc::obj_at_offset<oop>(src_pos);
-     size_t dst_offset = (size_t) objArrayOopDesc::obj_at_offset<oop>(dst_pos);
-     assert(arrayOopDesc::obj_offset_to_raw<oop>(s, src_offset, nullptr) ==
-            objArrayOop(s)->obj_at_addr<oop>(src_pos), "sanity");
-     assert(arrayOopDesc::obj_offset_to_raw<oop>(d, dst_offset, nullptr) ==
-            objArrayOop(d)->obj_at_addr<oop>(dst_pos), "sanity");
-     do_copy(s, src_offset, d, dst_offset, length, CHECK);
-   }
  }
  
  bool ObjArrayKlass::can_be_primary_super_slow() const {
    if (!bottom_klass()->can_be_primary_super())
      // array of interfaces
--- 238,27 ---
      }
    }
    return h_array();
  }
  
  void ObjArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d,
                                 int dst_pos, int length, TRAPS) {
    assert(s->is_objArray(), "must be obj array");
  
!   if (UseArrayFlattening) {
!     if (d->is_flatArray()) {
!       FlatArrayKlass::cast(d->klass())->copy_array(s, src_pos, d, dst_pos, length, THREAD);
!       return;
      }
!     if (s->is_flatArray()) {
!       FlatArrayKlass::cast(s->klass())->copy_array(s, src_pos, d, dst_pos, length, THREAD);
!       return;
      }
    }
  
!   assert(s->is_refArray() && d->is_refArray(), "Must be");
!   RefArrayKlass::cast(s->klass())->copy_array(s, src_pos, d, dst_pos, length, THREAD);
  }
  
  bool ObjArrayKlass::can_be_primary_super_slow() const {
    if (!bottom_klass()->can_be_primary_super())
      // array of interfaces

*** 333,21 ***
  
  void ObjArrayKlass::metaspace_pointers_do(MetaspaceClosure* it) {
    ArrayKlass::metaspace_pointers_do(it);
    it->push(&_element_klass);
    it->push(&_bottom_klass);
  }
  
  u2 ObjArrayKlass::compute_modifier_flags() const {
    // The modifier for an objectArray is the same as its element
    assert (element_klass() != nullptr, "should be initialized");
  
    // Return the flags of the bottom element type.
    u2 element_flags = bottom_klass()->compute_modifier_flags();
  
    return (element_flags & (JVM_ACC_PUBLIC | JVM_ACC_PRIVATE | JVM_ACC_PROTECTED))
!                         | (JVM_ACC_ABSTRACT | JVM_ACC_FINAL);
  }
  
  ModuleEntry* ObjArrayKlass::module() const {
    assert(bottom_klass() != nullptr, "ObjArrayKlass returned unexpected null bottom_klass");
    // The array is defined in the module of its bottom class
--- 299,49 ---
  
  void ObjArrayKlass::metaspace_pointers_do(MetaspaceClosure* it) {
    ArrayKlass::metaspace_pointers_do(it);
    it->push(&_element_klass);
    it->push(&_bottom_klass);
+   if (_next_refined_array_klass != nullptr && !CDSConfig::is_dumping_dynamic_archive()) {
+     it->push(&_next_refined_array_klass);
+   }
+ }
+ 
+ void ObjArrayKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
+   ArrayKlass::restore_unshareable_info(loader_data, protection_domain, CHECK);
+   if (_next_refined_array_klass != nullptr) {
+     _next_refined_array_klass->restore_unshareable_info(loader_data, protection_domain, CHECK);
+   }
+ }
+ 
+ void ObjArrayKlass::remove_unshareable_info() {
+   ArrayKlass::remove_unshareable_info();
+   if (_next_refined_array_klass != nullptr && !CDSConfig::is_dumping_dynamic_archive()) {
+     _next_refined_array_klass->remove_unshareable_info();
+   } else {
+     _next_refined_array_klass = nullptr;
+   }
+ }
+ 
+ void ObjArrayKlass::remove_java_mirror() {
+   ArrayKlass::remove_java_mirror();
+   if (_next_refined_array_klass != nullptr) {
+     _next_refined_array_klass->remove_java_mirror();
+   }
  }
  
  u2 ObjArrayKlass::compute_modifier_flags() const {
    // The modifier for an objectArray is the same as its element
    assert (element_klass() != nullptr, "should be initialized");
  
    // Return the flags of the bottom element type.
    u2 element_flags = bottom_klass()->compute_modifier_flags();
  
+   int identity_flag = (Arguments::enable_preview()) ? JVM_ACC_IDENTITY : 0;
+ 
    return (element_flags & (JVM_ACC_PUBLIC | JVM_ACC_PRIVATE | JVM_ACC_PROTECTED))
!                         | (identity_flag | JVM_ACC_ABSTRACT | JVM_ACC_FINAL);
  }
  
  ModuleEntry* ObjArrayKlass::module() const {
    assert(bottom_klass() != nullptr, "ObjArrayKlass returned unexpected null bottom_klass");
    // The array is defined in the module of its bottom class

*** 357,16 ***
  PackageEntry* ObjArrayKlass::package() const {
    assert(bottom_klass() != nullptr, "ObjArrayKlass returned unexpected null bottom_klass");
    return bottom_klass()->package();
  }
  
  // Printing
  
  void ObjArrayKlass::print_on(outputStream* st) const {
  #ifndef PRODUCT
    Klass::print_on(st);
!   st->print(" - instance klass: ");
    element_klass()->print_value_on(st);
    st->cr();
  #endif //PRODUCT
  }
  
--- 351,55 ---
  PackageEntry* ObjArrayKlass::package() const {
    assert(bottom_klass() != nullptr, "ObjArrayKlass returned unexpected null bottom_klass");
    return bottom_klass()->package();
  }
  
+ ObjArrayKlass* ObjArrayKlass::klass_with_properties(ArrayKlass::ArrayProperties props, TRAPS) {
+   assert(props != ArrayProperties::INVALID, "Sanity check");
+ 
+   if (properties() == props) {
+     assert(is_refArray_klass() || is_flatArray_klass(), "Must be a concrete array klass");
+     return this;
+   }
+ 
+   ObjArrayKlass* ak = next_refined_array_klass_acquire();
+   if (ak == nullptr) {
+     // Ensure atomic creation of refined array klasses
+     RecursiveLocker rl(MultiArray_lock, THREAD);
+ 
+     if (next_refined_array_klass() ==  nullptr) {
+       ArrayDescription ad = ObjArrayKlass::array_layout_selection(element_klass(), props);
+       switch (ad._kind) {
+         case Klass::RefArrayKlassKind: {
+           ak = RefArrayKlass::allocate_refArray_klass(class_loader_data(), dimension(), element_klass(), props, CHECK_NULL);
+           break;
+         }
+         case Klass::FlatArrayKlassKind: {
+           assert(dimension() == 1, "Flat arrays can only be dimension 1 arrays");
+           ak = FlatArrayKlass::allocate_klass(element_klass(), props, ad._layout_kind, CHECK_NULL);
+           break;
+         }
+         default:
+           ShouldNotReachHere();
+       }
+       release_set_next_refined_klass(ak);
+     }
+   }
+ 
+   ak = next_refined_array_klass();
+   assert(ak != nullptr, "should be set");
+   THREAD->check_possible_safepoint();
+   return ak->klass_with_properties(props, THREAD); // why not CHECK_NULL ?
+ }
+ 
+ 
  // Printing
  
  void ObjArrayKlass::print_on(outputStream* st) const {
  #ifndef PRODUCT
    Klass::print_on(st);
!   st->print(" - element klass: ");
    element_klass()->print_value_on(st);
    st->cr();
  #endif //PRODUCT
  }
  

*** 378,42 ***
  }
  
  #ifndef PRODUCT
  
  void ObjArrayKlass::oop_print_on(oop obj, outputStream* st) {
!   ArrayKlass::oop_print_on(obj, st);
-   assert(obj->is_objArray(), "must be objArray");
-   objArrayOop oa = objArrayOop(obj);
-   int print_len = MIN2(oa->length(), MaxElementPrintSize);
-   for(int index = 0; index < print_len; index++) {
-     st->print(" - %3d : ", index);
-     if (oa->obj_at(index) != nullptr) {
-       oa->obj_at(index)->print_value_on(st);
-       st->cr();
-     } else {
-       st->print_cr("null");
-     }
-   }
-   int remaining = oa->length() - print_len;
-   if (remaining > 0) {
-     st->print_cr(" - <%d more elements, increase MaxElementPrintSize to print>", remaining);
-   }
  }
  
  #endif //PRODUCT
  
  void ObjArrayKlass::oop_print_value_on(oop obj, outputStream* st) {
!   assert(obj->is_objArray(), "must be objArray");
-   st->print("a ");
-   element_klass()->print_value_on(st);
-   int len = objArrayOop(obj)->length();
-   st->print("[%d] ", len);
-   if (obj != nullptr) {
-     obj->print_address_on(st);
-   } else {
-     st->print_cr("null");
-   }
  }
  
  const char* ObjArrayKlass::internal_name() const {
    return external_name();
  }
--- 411,17 ---
  }
  
  #ifndef PRODUCT
  
  void ObjArrayKlass::oop_print_on(oop obj, outputStream* st) {
!   ShouldNotReachHere();
  }
  
  #endif //PRODUCT
  
  void ObjArrayKlass::oop_print_value_on(oop obj, outputStream* st) {
!   ShouldNotReachHere();
  }
  
  const char* ObjArrayKlass::internal_name() const {
    return external_name();
  }

*** 424,16 ***
  void ObjArrayKlass::verify_on(outputStream* st) {
    ArrayKlass::verify_on(st);
    guarantee(element_klass()->is_klass(), "should be klass");
    guarantee(bottom_klass()->is_klass(), "should be klass");
    Klass* bk = bottom_klass();
!   guarantee(bk->is_instance_klass() || bk->is_typeArray_klass(),  "invalid bottom klass");
  }
  
  void ObjArrayKlass::oop_verify_on(oop obj, outputStream* st) {
    ArrayKlass::oop_verify_on(obj, st);
    guarantee(obj->is_objArray(), "must be objArray");
    objArrayOop oa = objArrayOop(obj);
    for(int index = 0; index < oa->length(); index++) {
      guarantee(oopDesc::is_oop_or_null(oa->obj_at(index)), "should be oop");
    }
  }
--- 432,18 ---
  void ObjArrayKlass::verify_on(outputStream* st) {
    ArrayKlass::verify_on(st);
    guarantee(element_klass()->is_klass(), "should be klass");
    guarantee(bottom_klass()->is_klass(), "should be klass");
    Klass* bk = bottom_klass();
!   guarantee(bk->is_instance_klass() || bk->is_typeArray_klass() || bk->is_flatArray_klass(),
+             "invalid bottom klass");
  }
  
  void ObjArrayKlass::oop_verify_on(oop obj, outputStream* st) {
    ArrayKlass::oop_verify_on(obj, st);
    guarantee(obj->is_objArray(), "must be objArray");
+   guarantee(obj->is_null_free_array() || (!is_null_free_array_klass()), "null-free klass but not object");
    objArrayOop oa = objArrayOop(obj);
    for(int index = 0; index < oa->length(); index++) {
      guarantee(oopDesc::is_oop_or_null(oa->obj_at(index)), "should be oop");
    }
  }
< prev index next >