src/hotspot/share/oops/objArrayKlass.hpp

*** 40,45 ***
    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(ClassLoaderData* loader_data, int n, Klass* k, Symbol* name, TRAPS);
   public:
    // For dummy objects
    ObjArrayKlass() {}
  
-   // Instance variables
-   Klass* element_klass() const      { return _element_klass; }
-   void set_element_klass(Klass* k)  { _element_klass = k; }
-   Klass** element_klass_addr()      { return &_element_klass; }
- 
    Klass* bottom_klass() const       { return _bottom_klass; }
    void set_bottom_klass(Klass* k)   { _bottom_klass = k; }
    Klass** bottom_klass_addr()       { return &_bottom_klass; }
  
    ModuleEntry* module() const;
    PackageEntry* package() const;
  
-   // Compiler/Interpreter offset
-   static ByteSize element_klass_offset() { return byte_offset_of(ObjArrayKlass, _element_klass); }
- 
    // Dispatched operation
    bool can_be_primary_super_slow() const;
    GrowableArray<Klass*>* compute_secondary_supers(int num_extra_slots,
                                                    Array<InstanceKlass*>* transitive_interfaces);
    DEBUG_ONLY(bool is_objArray_klass_slow()  const  { return true; })
    size_t oop_size(oop obj) const;
  
    // Allocation
    static ObjArrayKlass* allocate_objArray_klass(ClassLoaderData* loader_data,
!                                                 int n, Klass* element_klass, TRAPS);
  
    objArrayOop allocate(int length, TRAPS);
    oop multi_allocate(int rank, jint* sizes, TRAPS);
  
    // Copying
--- 40,37 ---
    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)
  
    // Constructor
!   ObjArrayKlass(int n, Klass* element_klass, Symbol* name, bool null_free);
!   static ObjArrayKlass* allocate(ClassLoaderData* loader_data, int n, Klass* k, Symbol* name, bool null_free, TRAPS);
   public:
    // For dummy objects
    ObjArrayKlass() {}
  
    Klass* bottom_klass() const       { return _bottom_klass; }
    void set_bottom_klass(Klass* k)   { _bottom_klass = k; }
    Klass** bottom_klass_addr()       { return &_bottom_klass; }
  
    ModuleEntry* module() const;
    PackageEntry* package() const;
  
    // Dispatched operation
    bool can_be_primary_super_slow() const;
    GrowableArray<Klass*>* compute_secondary_supers(int num_extra_slots,
                                                    Array<InstanceKlass*>* transitive_interfaces);
    DEBUG_ONLY(bool is_objArray_klass_slow()  const  { return true; })
    size_t oop_size(oop obj) const;
  
    // Allocation
    static ObjArrayKlass* allocate_objArray_klass(ClassLoaderData* loader_data,
!                                                 int n, Klass* element_klass,
+                                                 bool null_free, TRAPS);
  
    objArrayOop allocate(int length, TRAPS);
    oop multi_allocate(int rank, jint* sizes, TRAPS);
  
    // Copying