src/hotspot/share/oops/instanceKlass.hpp

*** 203,215 ****
  
    // the source debug extension for this klass, NULL if not specified.
    // Specified as UTF-8 string without terminating zero byte in the classfile,
    // it is stored in the instanceklass as a NULL-terminated UTF-8 string
    const char*     _source_debug_extension;
-   // Array name derived from this class which needs unreferencing
-   // if this class is unloaded.
-   Symbol*         _array_name;
  
    // Number of heapOopSize words used by non-static fields in this klass
    // (including inherited fields but after header_size()).
    int             _nonstatic_field_size;
    int             _static_field_size;    // number words used by static fields (oop and non-oop) in this klass
--- 203,212 ----
*** 732,745 ****
  
    // source debug extension
    const char* source_debug_extension() const { return _source_debug_extension; }
    void set_source_debug_extension(const char* array, int length);
  
-   // symbol unloading support (refcount already added)
-   Symbol* array_name()                     { return _array_name; }
-   void set_array_name(Symbol* name)        { assert(_array_name == NULL  || name == NULL, "name already created"); _array_name = name; }
- 
    // nonstatic oop-map blocks
    static int nonstatic_oop_map_size(unsigned int oop_map_count) {
      return oop_map_count * OopMapBlock::size_in_words();
    }
    unsigned int nonstatic_oop_map_count() const {
--- 729,738 ----
*** 1191,1201 ****
    // referenced by handles.
    bool on_stack() const { return _constants->on_stack(); }
  
    // callbacks for actions during class unloading
    static void unload_class(InstanceKlass* ik);
!   static void release_C_heap_structures(InstanceKlass* ik);
  
    // Naming
    const char* signature_name() const;
  
    // Oop fields (and metadata) iterators
--- 1184,1195 ----
    // referenced by handles.
    bool on_stack() const { return _constants->on_stack(); }
  
    // callbacks for actions during class unloading
    static void unload_class(InstanceKlass* ik);
! 
!   virtual void release_C_heap_structures();
  
    // Naming
    const char* signature_name() const;
  
    // Oop fields (and metadata) iterators
*** 1302,1312 ****
                                    OverpassLookupMode overpass_mode,
                                    StaticLookupMode static_mode,
                                    PrivateLookupMode private_mode);
  
    // Free CHeap allocated fields.
!   void release_C_heap_structures();
  
  #if INCLUDE_JVMTI
    // RedefineClasses support
    void link_previous_versions(InstanceKlass* pv) { _previous_versions = pv; }
    void mark_newly_obsolete_methods(Array<Method*>* old_methods, int emcp_method_count);
--- 1296,1306 ----
                                    OverpassLookupMode overpass_mode,
                                    StaticLookupMode static_mode,
                                    PrivateLookupMode private_mode);
  
    // Free CHeap allocated fields.
!   void release_C_heap_structures_internal();
  
  #if INCLUDE_JVMTI
    // RedefineClasses support
    void link_previous_versions(InstanceKlass* pv) { _previous_versions = pv; }
    void mark_newly_obsolete_methods(Array<Method*>* old_methods, int emcp_method_count);