--- old/src/hotspot/share/gc/g1/g1MemoryPool.cpp	2018-10-08 18:33:18.000000000 -0400
+++ new/src/hotspot/share/gc/g1/g1MemoryPool.cpp	2018-10-08 18:33:17.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -62,13 +62,35 @@
   return _g1mm->survivor_space_memory_usage(initial_size(), max_size());
 }
 
-G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h, size_t initial_size, size_t max_size) :
+G1OldPool::G1OldPool(G1CollectedHeap* g1h, size_t initial_size, size_t max_size) :
   G1MemoryPoolSuper(g1h,
-                    "G1 Old Gen",
+                    g1h->g1mm()->use_legacy_monitoring() ? "G1 Old Gen" : "G1 Old Space",
                     initial_size,
                     max_size,
                     true /* support_usage_threshold */) { }
 
-MemoryUsage G1OldGenPool::get_memory_usage() {
-  return _g1mm->old_gen_memory_usage(initial_size(), max_size());
+MemoryUsage G1OldPool::get_memory_usage() {
+  return _g1mm->old_space_memory_usage(initial_size(), max_size());
+}
+
+G1ArchivePool::G1ArchivePool(G1CollectedHeap* g1h, size_t initial_size) :
+  G1MemoryPoolSuper(g1h,
+                    "G1 Archive Space",
+                    initial_size,
+                    MemoryUsage::undefined_size(),
+                    false /* support_usage_threshold */) { }
+
+MemoryUsage G1ArchivePool::get_memory_usage() {
+  return _g1mm->archive_space_memory_usage(initial_size(), max_size());
+}
+
+G1HumongousPool::G1HumongousPool(G1CollectedHeap* g1h, size_t initial_size) :
+  G1MemoryPoolSuper(g1h,
+                    "G1 Humongous Space",
+                    initial_size,
+                    MemoryUsage::undefined_size(),
+                    true /* support_usage_threshold */) { }
+
+MemoryUsage G1HumongousPool::get_memory_usage() {
+  return _g1mm->humongous_space_memory_usage(initial_size(), max_size());
 }