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

*** 57,70 ****
    nonstatic_field(G1MonitoringSupport, _survivor_committed, size_t)           \
    nonstatic_field(G1MonitoringSupport, _survivor_used,      size_t)           \
    nonstatic_field(G1MonitoringSupport, _old_committed,      size_t)           \
    nonstatic_field(G1MonitoringSupport, _old_used,           size_t)           \
                                                                                \
!   nonstatic_field(HeapRegionSetBase,   _count,          HeapRegionSetCount)   \
!                                                                               \
!   nonstatic_field(HeapRegionSetCount,  _length,         uint)                 \
!   nonstatic_field(HeapRegionSetCount,  _capacity,       size_t)               \
                                                                                \
    nonstatic_field(PtrQueue,            _active,         bool)                 \
    nonstatic_field(PtrQueue,            _buf,            void**)               \
    nonstatic_field(PtrQueue,            _index,          size_t)               \
  
--- 57,67 ----
    nonstatic_field(G1MonitoringSupport, _survivor_committed, size_t)           \
    nonstatic_field(G1MonitoringSupport, _survivor_used,      size_t)           \
    nonstatic_field(G1MonitoringSupport, _old_committed,      size_t)           \
    nonstatic_field(G1MonitoringSupport, _old_used,           size_t)           \
                                                                                \
!   nonstatic_field(HeapRegionSetBase,   _length,         uint)                 \
                                                                                \
    nonstatic_field(PtrQueue,            _active,         bool)                 \
    nonstatic_field(PtrQueue,            _buf,            void**)               \
    nonstatic_field(PtrQueue,            _index,          size_t)               \
  
*** 101,111 ****
                                                                                \
    declare_type(G1OffsetTableContigSpace, CompactibleSpace)                    \
    declare_type(HeapRegion, G1OffsetTableContigSpace)                          \
    declare_toplevel_type(HeapRegionManager)                                    \
    declare_toplevel_type(HeapRegionSetBase)                                    \
-   declare_toplevel_type(HeapRegionSetCount)                                   \
    declare_toplevel_type(G1MonitoringSupport)                                  \
    declare_toplevel_type(PtrQueue)                                             \
                                                                                \
    declare_toplevel_type(G1CollectedHeap*)                                     \
    declare_toplevel_type(HeapRegion*)                                          \
--- 98,107 ----