src/share/vm/oops/instanceKlass.hpp

*** 835,845 ****
    JNIid* jni_id_for(int offset);
  
    // maintenance of deoptimization dependencies
    int mark_dependent_nmethods(DepChange& changes);
    void add_dependent_nmethod(nmethod* nm);
!   void remove_dependent_nmethod(nmethod* nm);
  
    // On-stack replacement support
    nmethod* osr_nmethods_head() const         { return _osr_nmethods_head; };
    void set_osr_nmethods_head(nmethod* h)     { _osr_nmethods_head = h; };
    void add_osr_nmethod(nmethod* n);
--- 835,845 ----
    JNIid* jni_id_for(int offset);
  
    // maintenance of deoptimization dependencies
    int mark_dependent_nmethods(DepChange& changes);
    void add_dependent_nmethod(nmethod* nm);
!   void remove_dependent_nmethod(nmethod* nm, bool deferred_delete);
  
    // On-stack replacement support
    nmethod* osr_nmethods_head() const         { return _osr_nmethods_head; };
    void set_osr_nmethods_head(nmethod* h)     { _osr_nmethods_head = h; };
    void add_osr_nmethod(nmethod* n);
*** 1019,1028 ****
--- 1019,1029 ----
  
  #if INCLUDE_JVMTI
    void adjust_default_methods(InstanceKlass* holder, bool* trace_name_printed);
  #endif // INCLUDE_JVMTI
  
+   void clean_weak_instanceklass_links(BoolObjectClosure* is_alive);
    void clean_implementors_list(BoolObjectClosure* is_alive);
    void clean_method_data(BoolObjectClosure* is_alive);
    void clean_dependent_nmethods();
  
    // Explicit metaspace deallocation of fields
*** 1347,1356 ****
--- 1348,1358 ----
    void set_next(nmethodBucket* b)         { _next = b; }
    nmethod* get_nmethod()                  { return _nmethod; }
  
    static int mark_dependent_nmethods(nmethodBucket* deps, DepChange& changes);
    static nmethodBucket* add_dependent_nmethod(nmethodBucket* deps, nmethod* nm);
+   static bool remove_dependent_nmethod(nmethodBucket** deps, nmethod* nm, bool deferred_delete);
    static bool remove_dependent_nmethod(nmethodBucket* deps, nmethod* nm);
    static nmethodBucket* clean_dependent_nmethods(nmethodBucket* deps);
  #ifndef PRODUCT
    static void print_dependent_nmethods(nmethodBucket* deps, bool verbose);
    static bool is_dependent_nmethod(nmethodBucket* deps, nmethod* nm);