8155943: Move G1Eden/SurvivorRegions into their own source files

Reviewed-by: sjohanss, ehelin

hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp

@@ -31,18 +31,19 @@
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1CollectorState.hpp"
 #include "gc/g1/g1ConcurrentMark.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
+#include "gc/g1/g1EdenRegions.hpp"
-#include "gc/g1/g1InCSetState.hpp"
-#include "gc/g1/g1MonitoringSupport.hpp"
 #include "gc/g1/g1EvacFailure.hpp"
 #include "gc/g1/g1EvacStats.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
+#include "gc/g1/g1InCSetState.hpp"
+#include "gc/g1/g1MonitoringSupport.hpp"
 #include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SurvivorRegions.hpp"
 #include "gc/g1/g1YCTypes.hpp"
 #include "gc/g1/hSpaceCounters.hpp"
 #include "gc/g1/heapRegionManager.hpp"
 #include "gc/g1/heapRegionSet.hpp"
-#include "gc/g1/youngList.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/plab.hpp"

hotspot/src/share/vm/gc/g1/g1DefaultPolicy.cpp

@@ -34,10 +34,10 @@
 #include "gc/g1/g1IHOPControl.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1Policy.hpp"
+#include "gc/g1/g1SurvivorRegions.hpp"
 #include "gc/g1/g1YoungGenSizer.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
-#include "gc/g1/youngList.hpp"
 #include "gc/shared/gcPolicyCounters.hpp"
 #include "logging/logStream.hpp"
 #include "runtime/arguments.hpp"

hotspot/src/share/vm/gc/g1/g1EdenRegions.hpp

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_G1_G1EDENREGIONS_HPP
+#define SHARE_VM_GC_G1_G1EDENREGIONS_HPP
+
+#include "gc/g1/heapRegion.hpp"
+#include "memory/allocation.hpp"
+#include "runtime/globals.hpp"
+#include "utilities/debug.hpp"
+
+class G1EdenRegions VALUE_OBJ_CLASS_SPEC {
+private:
+  int _length;
+
+public:
+  G1EdenRegions() : _length(0) {}
+
+  void add(HeapRegion* hr) {
+    assert(!hr->is_eden(), "should not already be set");
+    _length++;
+  }
+
+  void clear() { _length = 0; }
+
+  uint length() const { return _length; }
+};
+
+#endif // SHARE_VM_GC_G1_G1EDENREGIONS_HPP

hotspot/src/share/vm/gc/g1/g1HeapVerifier.cpp

@@ -36,7 +36,6 @@
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/g1/g1StringDedup.hpp"
-#include "gc/g1/youngList.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 

hotspot/src/share/vm/gc/g1/g1SurvivorRegions.cpp

@@ -23,8 +23,8 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/g1/g1SurvivorRegions.hpp"
 #include "gc/g1/heapRegion.hpp"
-#include "gc/g1/youngList.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/debug.hpp"
 
@@ -53,7 +53,3 @@ void G1SurvivorRegions::clear() {
   _regions->clear();
 }
 
-void G1EdenRegions::add(HeapRegion* hr) {
-  assert(!hr->is_eden(), "should not already be set");
-  _length++;
-}

hotspot/src/share/vm/gc/g1/g1SurvivorRegions.hpp

@@ -22,14 +22,15 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_YOUNGLIST_HPP
+#ifndef SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
-#define SHARE_VM_GC_G1_YOUNGLIST_HPP
+#define SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/globals.hpp"
 
 template <typename T>
 class GrowableArray;
+class HeapRegion;
 
 class G1SurvivorRegions VALUE_OBJ_CLASS_SPEC {
 private:
@@ -51,18 +52,4 @@ public:
   }
 };
 
-class G1EdenRegions VALUE_OBJ_CLASS_SPEC {
+#endif // SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
-private:
-  int _length;
-
-public:
-  G1EdenRegions() : _length(0) {}
-
-  void add(HeapRegion* hr);
-
-  void clear() { _length = 0; }
-
-  uint length() const { return _length; }
-};
-
-#endif // SHARE_VM_GC_G1_YOUNGLIST_HPP