src/hotspot/share/oops/objArrayKlass.hpp

*** 42,30 ***
    static const KlassKind Kind = ObjArrayKlassKind;
  
   private:
    // If you add a new field that points to any metaspace object, you
    // must add this field to ObjArrayKlass::metaspace_pointers_do().
-   Klass* _element_klass;            // The klass of the elements of this array type
    Klass* _bottom_klass;             // The one-dimensional type (InstanceKlass or TypeArrayKlass)
  
    // Constructor
!   ObjArrayKlass(int n, Klass* element_klass, Symbol* name);
!   static ObjArrayKlass* allocate_klass(ClassLoaderData* loader_data, int n, Klass* k, Symbol* name, TRAPS);
  
!   objArrayOop allocate_instance(int length, TRAPS);
  
!  protected:
-   // Create array_name for element klass
    static Symbol* create_element_klass_array_name(JavaThread* current, Klass* element_klass);
  
   public:
    // For dummy objects
    ObjArrayKlass() {}
  
!   // Instance variables
!   Klass* element_klass() const      { return _element_klass; }
!   void set_element_klass(Klass* k)  { _element_klass = k; }
  
    // Compiler/Interpreter offset
    static ByteSize element_klass_offset() { return byte_offset_of(ObjArrayKlass, _element_klass); }
  
    Klass* bottom_klass() const       { return _bottom_klass; }
--- 42,41 ---
    static const KlassKind Kind = ObjArrayKlassKind;
  
   private:
    // If you add a new field that points to any metaspace object, you
    // must add this field to ObjArrayKlass::metaspace_pointers_do().
    Klass* _bottom_klass;             // The one-dimensional type (InstanceKlass or TypeArrayKlass)
+  protected:
+   Klass* _element_klass;            // The klass of the elements of this array type
+   ObjArrayKlass* _next_refined_array_klass;
  
+  protected:
    // Constructor
!   ObjArrayKlass(int n, Klass* element_klass, Symbol* name, KlassKind kind, ArrayKlass::ArrayProperties props, markWord mw);
!   static ObjArrayKlass* allocate_klass(ClassLoaderData* loader_data, int n, Klass* k, Symbol* name, ArrayKlass::ArrayProperties props, TRAPS);
  
!   static ArrayDescription array_layout_selection(Klass* element, ArrayProperties properties);
+   ObjArrayKlass* allocate_klass_with_properties(ArrayKlass::ArrayProperties props, TRAPS);
+   virtual objArrayOop allocate_instance(int length, ArrayProperties props, TRAPS);
  
!    // Create array_name for element klass
    static Symbol* create_element_klass_array_name(JavaThread* current, Klass* element_klass);
  
   public:
    // For dummy objects
    ObjArrayKlass() {}
  
!   virtual Klass* element_klass() const      { return _element_klass; }
!   virtual void set_element_klass(Klass* k)  { _element_klass = k; }
! 
+ 
+   ObjArrayKlass* next_refined_array_klass() const      { return _next_refined_array_klass; }
+   inline ObjArrayKlass* next_refined_array_klass_acquire() const;
+   void set_next_refined_klass_klass(ObjArrayKlass* ak) { _next_refined_array_klass = ak; }
+   inline void release_set_next_refined_klass(ObjArrayKlass* ak);
+   ObjArrayKlass* klass_with_properties(ArrayKlass::ArrayProperties properties, TRAPS);
+   static ByteSize next_refined_array_klass_offset() { return byte_offset_of(ObjArrayKlass, _next_refined_array_klass); }
  
    // Compiler/Interpreter offset
    static ByteSize element_klass_offset() { return byte_offset_of(ObjArrayKlass, _element_klass); }
  
    Klass* bottom_klass() const       { return _bottom_klass; }

*** 92,18 ***
    void copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS) override;
  
    // Compute protection domain
    oop protection_domain() const override { return bottom_klass()->protection_domain(); }
  
!   virtual void metaspace_pointers_do(MetaspaceClosure* iter) override;
  
-  private:
-   // Either oop or narrowOop depending on UseCompressedOops.
-   // must be called from within ObjArrayKlass.cpp
-   void do_copy(arrayOop s, size_t src_offset,
-                arrayOop d, size_t dst_offset,
-                int length, TRAPS);
   public:
    static ObjArrayKlass* cast(Klass* k) {
      return const_cast<ObjArrayKlass*>(cast(const_cast<const Klass*>(k)));
    }
  
--- 103,18 ---
    void copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS) override;
  
    // Compute protection domain
    oop protection_domain() const override { return bottom_klass()->protection_domain(); }
  
!   void metaspace_pointers_do(MetaspaceClosure* iter) override;
+ 
+ #if INCLUDE_CDS
+   void remove_unshareable_info() override;
+   void remove_java_mirror() override;
+   void restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS);
+ #endif
  
   public:
    static ObjArrayKlass* cast(Klass* k) {
      return const_cast<ObjArrayKlass*>(cast(const_cast<const Klass*>(k)));
    }