Print this page
rev 2722 : 7095194: G1: HeapRegion::GrainBytes, GrainWords, and CardsPerRegion should be size_t
Summary: Declare GrainBytes, GrainWords, and CardsPerRegion as size_t.
Reviewed-by:

Split Close
Expand all
Collapse all
          --- old/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
          +++ new/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
↓ open down ↓ 23 lines elided ↑ open up ↑
  24   24  
  25   25  #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
  26   26  #define SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
  27   27  
  28   28  #include "gc_implementation/g1/heapRegion.hpp"
  29   29  #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
  30   30  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  31   31  
  32   32  #define VM_STRUCTS_G1(nonstatic_field, static_field)                          \
  33   33                                                                                \
  34      -  static_field(HeapRegion, GrainBytes, int)                                   \
       34 +  static_field(HeapRegion, GrainBytes, size_t)                                \
  35   35                                                                                \
  36   36    nonstatic_field(HeapRegionSeq,   _regions, HeapRegion**)                    \
  37   37    nonstatic_field(HeapRegionSeq,   _length,  size_t)                          \
  38   38                                                                                \
  39   39    nonstatic_field(G1CollectedHeap, _hrs,                HeapRegionSeq)        \
  40   40    nonstatic_field(G1CollectedHeap, _g1_committed,       MemRegion)            \
  41   41    nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t)               \
  42   42  
  43   43  
  44   44  #define VM_TYPES_G1(declare_type, declare_toplevel_type)                      \
  45   45                                                                                \
  46   46    declare_type(G1CollectedHeap, SharedHeap)                                   \
  47   47                                                                                \
  48   48    declare_type(HeapRegion, ContiguousSpace)                                   \
  49   49    declare_toplevel_type(HeapRegionSeq)                                        \
  50   50                                                                                \
  51   51    declare_toplevel_type(G1CollectedHeap*)                                     \
  52   52    declare_toplevel_type(HeapRegion*)                                          \
  53   53  
  54   54  #endif // SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX