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

rev 56812 : imported patch 8189737-stefanj-review

*** 36,49 ****
                                                                                \
    static_field(HeapRegion, GrainBytes,        size_t)                         \
    static_field(HeapRegion, LogOfHRGrainBytes, int)                            \
                                                                                \
    nonstatic_field(HeapRegion, _type,          HeapRegionType)                 \
                                                                                \
    nonstatic_field(HeapRegionType, _tag,       HeapRegionType::Tag volatile)   \
                                                                                \
-   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)               \
--- 36,52 ----
                                                                                \
    static_field(HeapRegion, GrainBytes,        size_t)                         \
    static_field(HeapRegion, LogOfHRGrainBytes, int)                            \
                                                                                \
    nonstatic_field(HeapRegion, _type,           HeapRegionType)                \
+   nonstatic_field(HeapRegion, _bottom,         HeapWord*)                     \
+   nonstatic_field(HeapRegion, _top,            HeapWord* volatile)            \
+   nonstatic_field(HeapRegion, _end,            HeapWord*)                     \
+   nonstatic_field(HeapRegion, _compaction_top, HeapWord*)                     \
                                                                                \
    nonstatic_field(HeapRegionType, _tag,       HeapRegionType::Tag volatile)   \
                                                                                \
                                                                                \
    nonstatic_field(G1HeapRegionTable, _base,             address)              \
    nonstatic_field(G1HeapRegionTable, _length,           size_t)               \
    nonstatic_field(G1HeapRegionTable, _biased_base,      address)              \
    nonstatic_field(G1HeapRegionTable, _bias,             size_t)               \
*** 92,103 ****
                                                                                \
    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)                                             \
    declare_toplevel_type(HeapRegionType)                                       \
--- 95,105 ----
                                                                                \
    declare_toplevel_type(G1HeapRegionTable)                                    \
                                                                                \
    declare_type(G1CollectedHeap, CollectedHeap)                                \
                                                                                \
!   declare_toplevel_type(HeapRegion)                                           \
    declare_toplevel_type(HeapRegionManager)                                    \
    declare_toplevel_type(HeapRegionSetBase)                                    \
    declare_toplevel_type(G1MonitoringSupport)                                  \
    declare_toplevel_type(PtrQueue)                                             \
    declare_toplevel_type(HeapRegionType)                                       \