--- old/src/share/vm/gc/cms/cmsHeap.hpp	2017-07-17 13:55:16.967945077 +0200
+++ new/src/share/vm/gc/cms/cmsHeap.hpp	2017-07-17 13:55:16.906946144 +0200
@@ -91,18 +91,17 @@
                          OopsInGenClosure* root_closure,
                          CLDClosure* cld_closure);
 
-protected:
-  void gc_prologue(bool full);
-  void gc_epilogue(bool full);
+private:
+  WorkGang* _workers;
+
+  virtual void gc_prologue(bool full);
+  virtual void gc_epilogue(bool full);
 
   // Accessor for memory state verification support
   NOT_PRODUCT(
     virtual size_t skip_header_HeapWords() { return CMSCollector::skip_header_HeapWords(); }
   )
 
-private:
-  WorkGang* _workers;
-
   // Returns success or failure.
   void create_cms_collector();
 
--- old/src/share/vm/gc/shared/genCollectedHeap.hpp	2017-07-17 13:55:17.173941475 +0200
+++ new/src/share/vm/gc/shared/genCollectedHeap.hpp	2017-07-17 13:55:17.116942472 +0200
@@ -399,6 +399,14 @@
   void process_string_table_roots(StrongRootsScope* scope,
                                   OopClosure* root_closure);
 
+  // Accessor for memory state verification support
+  NOT_PRODUCT(
+    virtual size_t skip_header_HeapWords() { return 0; }
+  )
+
+  virtual void gc_prologue(bool full);
+  virtual void gc_epilogue(bool full);
+
  public:
   void young_process_roots(StrongRootsScope* scope,
                            OopsInGenClosure* root_closure,
@@ -472,12 +480,6 @@
                               size_t obj_size);
 
 
-protected:
-  // Accessor for memory state verification support
-  NOT_PRODUCT(
-    virtual size_t skip_header_HeapWords() { return 0; }
-  )
-
 private:
   // Override
   void check_for_non_bad_heap_word_value(HeapWord* addr,
@@ -495,11 +497,6 @@
 
   // Save the tops of the spaces in all generations
   void record_gen_tops_before_GC() PRODUCT_RETURN;
-
-protected:
-  virtual void gc_prologue(bool full);
-  virtual void gc_epilogue(bool full);
-
 };
 
 #endif // SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP