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

*** 33,43 ****
  #define VM_STRUCTS_G1(nonstatic_field, static_field)                          \
                                                                                \
    static_field(HeapRegion, GrainBytes,        size_t)                         \
    static_field(HeapRegion, LogOfHRGrainBytes, int)                            \
                                                                                \
!   nonstatic_field(G1OffsetTableContigSpace, _top,       HeapWord* volatile)   \
                                                                                \
    nonstatic_field(G1HeapRegionTable, _base,             address)              \
    nonstatic_field(G1HeapRegionTable, _length,           size_t)               \
    nonstatic_field(G1HeapRegionTable, _biased_base,      address)              \
    nonstatic_field(G1HeapRegionTable, _bias,             size_t)               \
--- 33,43 ----
  #define VM_STRUCTS_G1(nonstatic_field, static_field)                          \
                                                                                \
    static_field(HeapRegion, GrainBytes,        size_t)                         \
    static_field(HeapRegion, LogOfHRGrainBytes, int)                            \
                                                                                \
!   nonstatic_field(G1ContiguousSpace, _top,              HeapWord* volatile)   \
                                                                                \
    nonstatic_field(G1HeapRegionTable, _base,             address)              \
    nonstatic_field(G1HeapRegionTable, _length,           size_t)               \
    nonstatic_field(G1HeapRegionTable, _biased_base,      address)              \
    nonstatic_field(G1HeapRegionTable, _bias,             size_t)               \
*** 94,105 ****
                                                                                \
    declare_toplevel_type(G1HeapRegionTable)                                    \
                                                                                \
    declare_type(G1CollectedHeap, CollectedHeap)                                \
                                                                                \
!   declare_type(G1OffsetTableContigSpace, CompactibleSpace)                    \
!   declare_type(HeapRegion, G1OffsetTableContigSpace)                          \
    declare_toplevel_type(HeapRegionManager)                                    \
    declare_toplevel_type(HeapRegionSetBase)                                    \
    declare_toplevel_type(G1MonitoringSupport)                                  \
    declare_toplevel_type(PtrQueue)                                             \
                                                                                \
--- 94,105 ----
                                                                                \
    declare_toplevel_type(G1HeapRegionTable)                                    \
                                                                                \
    declare_type(G1CollectedHeap, CollectedHeap)                                \
                                                                                \
!   declare_type(G1ContiguousSpace, CompactibleSpace)                           \
!   declare_type(HeapRegion, G1ContiguousSpace)                                 \
    declare_toplevel_type(HeapRegionManager)                                    \
    declare_toplevel_type(HeapRegionSetBase)                                    \
    declare_toplevel_type(G1MonitoringSupport)                                  \
    declare_toplevel_type(PtrQueue)                                             \
                                                                                \