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

rev 6923 : imported patch 8054819-rename-heapregionseq

*** 24,34 ****
  
  #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
  #define SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
  
  #include "gc_implementation/g1/heapRegion.hpp"
! #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  
  #define VM_STRUCTS_G1(nonstatic_field, static_field)                          \
                                                                                \
    static_field(HeapRegion, GrainBytes,        size_t)                         \
--- 24,34 ----
  
  #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
  #define SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
  
  #include "gc_implementation/g1/heapRegion.hpp"
! #include "gc_implementation/g1/heapRegionManager.inline.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  
  #define VM_STRUCTS_G1(nonstatic_field, static_field)                          \
                                                                                \
    static_field(HeapRegion, GrainBytes,        size_t)                         \
*** 40,53 ****
    nonstatic_field(G1HeapRegionTable, _length,           size_t)               \
    nonstatic_field(G1HeapRegionTable, _biased_base,      address)              \
    nonstatic_field(G1HeapRegionTable, _bias,             size_t)               \
    nonstatic_field(G1HeapRegionTable, _shift_by,         uint)                 \
                                                                                \
!   nonstatic_field(HeapRegionSeq,   _regions,            G1HeapRegionTable)    \
!   nonstatic_field(HeapRegionSeq,   _num_committed,      uint)                 \
                                                                                \
!   nonstatic_field(G1CollectedHeap, _hrs,                HeapRegionSeq)        \
    nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t)               \
    nonstatic_field(G1CollectedHeap, _g1mm,               G1MonitoringSupport*) \
    nonstatic_field(G1CollectedHeap, _old_set,            HeapRegionSetBase)    \
    nonstatic_field(G1CollectedHeap, _humongous_set,      HeapRegionSetBase)    \
                                                                                \
--- 40,53 ----
    nonstatic_field(G1HeapRegionTable, _length,           size_t)               \
    nonstatic_field(G1HeapRegionTable, _biased_base,      address)              \
    nonstatic_field(G1HeapRegionTable, _bias,             size_t)               \
    nonstatic_field(G1HeapRegionTable, _shift_by,         uint)                 \
                                                                                \
!   nonstatic_field(HeapRegionManager, _regions,          G1HeapRegionTable)    \
!   nonstatic_field(HeapRegionManager, _num_committed,    uint)                 \
                                                                                \
!   nonstatic_field(G1CollectedHeap, _hrm,                HeapRegionManager)    \
    nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t)               \
    nonstatic_field(G1CollectedHeap, _g1mm,               G1MonitoringSupport*) \
    nonstatic_field(G1CollectedHeap, _old_set,            HeapRegionSetBase)    \
    nonstatic_field(G1CollectedHeap, _humongous_set,      HeapRegionSetBase)    \
                                                                                \
*** 70,80 ****
                                                                                \
    declare_type(G1CollectedHeap, SharedHeap)                                   \
                                                                                \
    declare_type(G1OffsetTableContigSpace, CompactibleSpace)                    \
    declare_type(HeapRegion, G1OffsetTableContigSpace)                          \
!   declare_toplevel_type(HeapRegionSeq)                                        \
    declare_toplevel_type(HeapRegionSetBase)                                    \
    declare_toplevel_type(HeapRegionSetCount)                                   \
    declare_toplevel_type(G1MonitoringSupport)                                  \
                                                                                \
    declare_toplevel_type(G1CollectedHeap*)                                     \
--- 70,80 ----
                                                                                \
    declare_type(G1CollectedHeap, SharedHeap)                                   \
                                                                                \
    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(G1CollectedHeap*)                                     \