src/share/vm/gc_implementation/shared/markSweep.hpp

*** 58,69 ****
     public:
      virtual void do_oop(oop* p);
      virtual void do_oop(narrowOop* p);
    };
  
!   class MarkAndPushClosure: public OopClosure {
     public:
      virtual void do_oop(oop* p);
      virtual void do_oop(narrowOop* p);
    };
  
    class FollowStackClosure: public VoidClosure {
--- 58,70 ----
     public:
      virtual void do_oop(oop* p);
      virtual void do_oop(narrowOop* p);
    };
  
!   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);
    };
  
    class FollowStackClosure: public VoidClosure {
*** 71,82 ****
--- 72,87 ----
      virtual void do_void();
    };
  
    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);
+ 
+     // This closure provides its own oop verification code.
+     debug_only(virtual bool should_verify_oops() { return false; })
    };
  
    // Used for java/lang/ref handling
    class IsAliveClosure: public BoolObjectClosure {
     public: