src/hotspot/share/gc/serial/markSweep.hpp

*** 54,64 ****
  
  class MarkSweep : AllStatic {
    //
    // Inline closure decls
    //
!   class FollowRootClosure: public OopsInGenClosure {
     public:
      virtual void do_oop(oop* p);
      virtual void do_oop(narrowOop* p);
    };
  
--- 54,64 ----
  
  class MarkSweep : AllStatic {
    //
    // Inline closure decls
    //
!   class FollowRootClosure: public BasicOopsInGenClosure {
     public:
      virtual void do_oop(oop* p);
      virtual void do_oop(narrowOop* p);
    };
  
*** 168,200 ****
    static void follow_array(objArrayOop array);
  
    static void follow_array_chunk(objArrayOop array, int index);
  };
  
! class MarkAndPushClosure: public ExtendedOopClosure {
  public:
!   template <typename T> void do_oop_nv(T* p);
    virtual void do_oop(oop* p);
    virtual void do_oop(narrowOop* p);
  
!   virtual bool do_metadata();
!   bool do_metadata_nv();
! 
    virtual void do_klass(Klass* k);
-   void do_klass_nv(Klass* k);
- 
    virtual void do_cld(ClassLoaderData* cld);
-   void do_cld_nv(ClassLoaderData* cld);
  
    void set_ref_discoverer(ReferenceDiscoverer* rd) {
      set_ref_discoverer_internal(rd);
    }
  };
  
! class AdjustPointerClosure: public OopsInGenClosure {
   public:
!   template <typename T> void do_oop_nv(T* p);
    virtual void do_oop(oop* p);
    virtual void do_oop(narrowOop* p);
    virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
  
    // This closure provides its own oop verification code.
--- 168,195 ----
    static void follow_array(objArrayOop array);
  
    static void follow_array_chunk(objArrayOop array, int index);
  };
  
! class MarkAndPushClosure: public OopIterateClosure {
  public:
!   template <typename T> void do_oop_work(T* p);
    virtual void do_oop(oop* p);
    virtual void do_oop(narrowOop* p);
  
!   virtual bool do_metadata() { return true; }
    virtual void do_klass(Klass* k);
    virtual void do_cld(ClassLoaderData* cld);
  
    void set_ref_discoverer(ReferenceDiscoverer* rd) {
      set_ref_discoverer_internal(rd);
    }
  };
  
! class AdjustPointerClosure: public BasicOopsInGenClosure {
   public:
!   template <typename T> void do_oop_work(T* p);
    virtual void do_oop(oop* p);
    virtual void do_oop(narrowOop* p);
    virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
  
    // This closure provides its own oop verification code.