src/hotspot/share/gc/g1/vmStructs_g1.hpp

rev 51649 : version 1
rev 52017 : All changes for G1 GC moved from 'combined' repo folder
rev 52491 : Changes in jdk.hotspot.agent

@@ -51,11 +51,11 @@
                                                                               \
   nonstatic_field(HeapRegionManager, _regions,          G1HeapRegionTable)    \
   nonstatic_field(HeapRegionManager, _num_committed,    uint)                 \
                                                                               \
   nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t)               \
-  nonstatic_field(G1CollectedHeap, _hrm,                HeapRegionManager)    \
+  nonstatic_field(G1CollectedHeap, _hrm,                HeapRegionManager*)    \
   nonstatic_field(G1CollectedHeap, _g1mm,               G1MonitoringSupport*) \
   nonstatic_field(G1CollectedHeap, _old_set,            HeapRegionSetBase)    \
   nonstatic_field(G1CollectedHeap, _archive_set,        HeapRegionSetBase)    \
   nonstatic_field(G1CollectedHeap, _humongous_set,      HeapRegionSetBase)    \
                                                                               \

@@ -81,10 +81,11 @@
   declare_constant(HeapRegionType::PinnedMask)                                \
   declare_constant(HeapRegionType::ArchiveMask)                               \
   declare_constant(HeapRegionType::StartsHumongousTag)                        \
   declare_constant(HeapRegionType::ContinuesHumongousTag)                     \
   declare_constant(HeapRegionType::OldMask)                                   \
+  declare_constant(HeapRegionType::PreMatureOldMask)                          \
   declare_constant(BarrierSet::G1BarrierSet)                                  \
   declare_constant(G1CardTable::g1_young_gen)
 
 #define VM_TYPES_G1GC(declare_type,                                           \
                       declare_toplevel_type,                                  \