--- old/src/share/vm/gc/cms/compactibleFreeListSpace.hpp	2016-12-20 16:30:51.542216998 -0500
+++ new/src/share/vm/gc/cms/compactibleFreeListSpace.hpp	2016-12-20 16:30:50.358149267 -0500
@@ -46,6 +46,7 @@
 class UpwardsObjectClosure;
 class ObjectClosureCareful;
 class Klass;
+class MarkSweep;
 
 class LinearAllocBlock VALUE_OBJ_CLASS_SPEC {
  public:
@@ -78,7 +79,7 @@
   friend class CompactibleFreeListSpaceLAB;
   // Allow scan_and_* functions to call (private) overrides of the auxiliary functions on this class
   template <typename SpaceType>
-  friend void CompactibleSpace::scan_and_adjust_pointers(SpaceType* space);
+  friend void CompactibleSpace::scan_and_adjust_pointers(SpaceType* space, MarkSweep* ms);
   template <typename SpaceType>
   friend void CompactibleSpace::scan_and_compact(SpaceType* space);
   template <typename SpaceType>
@@ -529,7 +530,7 @@
 
   // Support for compaction.
   void prepare_for_compaction(CompactPoint* cp);
-  void adjust_pointers();
+  void adjust_pointers(MarkSweep*);
   void compact();
   // Reset the space to reflect the fact that a compaction of the
   // space has been done.