1.1 --- a/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp Thu Sep 04 16:53:27 2014 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp Fri Sep 05 09:49:19 2014 +0200
1.3 @@ -45,11 +45,13 @@
1.4 nonstatic_field(HeapRegionManager, _regions, G1HeapRegionTable) \
1.5 nonstatic_field(HeapRegionManager, _num_committed, uint) \
1.6 \
1.7 + nonstatic_field(G1Allocator, _summary_bytes_used, size_t) \
1.8 + \
1.9 nonstatic_field(G1CollectedHeap, _hrm, HeapRegionManager) \
1.10 - nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t) \
1.11 nonstatic_field(G1CollectedHeap, _g1mm, G1MonitoringSupport*) \
1.12 nonstatic_field(G1CollectedHeap, _old_set, HeapRegionSetBase) \
1.13 nonstatic_field(G1CollectedHeap, _humongous_set, HeapRegionSetBase) \
1.14 + nonstatic_field(G1CollectedHeap, _allocator, G1Allocator*) \
1.15 \
1.16 nonstatic_field(G1MonitoringSupport, _eden_committed, size_t) \
1.17 nonstatic_field(G1MonitoringSupport, _eden_used, size_t) \
1.18 @@ -72,14 +74,16 @@
1.19 \
1.20 declare_type(G1OffsetTableContigSpace, CompactibleSpace) \
1.21 declare_type(HeapRegion, G1OffsetTableContigSpace) \
1.22 - declare_toplevel_type(HeapRegionManager) \
1.23 + declare_toplevel_type(HeapRegionManager) \
1.24 declare_toplevel_type(HeapRegionSetBase) \
1.25 declare_toplevel_type(HeapRegionSetCount) \
1.26 declare_toplevel_type(G1MonitoringSupport) \
1.27 + declare_toplevel_type(G1Allocator) \
1.28 \
1.29 declare_toplevel_type(G1CollectedHeap*) \
1.30 declare_toplevel_type(HeapRegion*) \
1.31 declare_toplevel_type(G1MonitoringSupport*) \
1.32 + declare_toplevel_type(G1Allocator*) \
1.33
1.34
1.35 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
