src/share/vm/gc/shared/genCollectedHeap.hpp

@@ -124,12 +124,10 @@
 public:
   GenCollectedHeap(GenCollectorPolicy *policy);
 
   WorkGang* workers() const { return _workers; }
 
-  GCStats* gc_stats(Generation* generation) const;
-
   // Returns JNI_OK on success
   virtual jint initialize();
 
   // Reserve aligned space for the heap as needed by the contained generations.
   char* allocate(size_t alignment, ReservedSpace* heap_rs);

@@ -380,13 +378,13 @@
   // excess storage retention.)
   // The "so" argument determines which of the roots
   // the closure is applied to:
   // "SO_None" does none;
   enum ScanningOption {
-    SO_None                =  0x0,
-    SO_AllCodeCache        =  0x8,
-    SO_ScavengeCodeCache   = 0x10
+    SO_None              = 0x00,
+    SO_AllCodeCache      = 0x08,
+    SO_ScavengeCodeCache = 0x10
   };
 
  private:
   void process_roots(StrongRootsScope* scope,
                      ScanningOption so,

@@ -395,20 +393,20 @@
                      CLDClosure* strong_cld_closure,
                      CLDClosure* weak_cld_closure,
                      CodeBlobClosure* code_roots);
 
  public:
-  static const bool StrongAndWeakRoots = false;
-  static const bool StrongRootsOnly    = true;
+  void young_process_roots(StrongRootsScope* scope,
+                           OopsInGenClosure* not_older_gens,
+                           OopsInGenClosure* older_gens,
+                           CLDClosure* cld_closure);
 
-  void gen_process_roots(StrongRootsScope* scope,
-                         GenerationType type,
+  void old_process_roots(StrongRootsScope* scope,
                          bool young_gen_as_roots,
                          ScanningOption so,
                          bool only_strong_roots,
                          OopsInGenClosure* not_older_gens,
-                         OopsInGenClosure* older_gens,
                          CLDClosure* cld_closure);
 
   // Apply "root_closure" to all the weak roots of the system.
   // These include JNI weak roots, string table,
   // and referents of reachable weak refs.