*** old/src/share/vm/runtime/vmStructs.cpp	Fri Oct 17 16:28:50 2014
--- new/src/share/vm/runtime/vmStructs.cpp	Fri Oct 17 16:28:50 2014

*** 513,556 ****
--- 513,554 ----
    nonstatic_field(CollectedHeap,               _reserved,                                     MemRegion)                             \
    nonstatic_field(CollectedHeap,               _barrier_set,                                  BarrierSet*)                           \
    nonstatic_field(CollectedHeap,               _defer_initial_card_mark,                      bool)                                  \
    nonstatic_field(CollectedHeap,               _is_gc_active,                                 bool)                                  \
    nonstatic_field(CollectedHeap,               _total_collections,                            unsigned int)                          \
+                                                                                                                                      \
    nonstatic_field(CompactibleSpace,            _compaction_top,                               HeapWord*)                             \
    nonstatic_field(CompactibleSpace,            _first_dead,                                   HeapWord*)                             \
    nonstatic_field(CompactibleSpace,            _end_of_live,                                  HeapWord*)                             \
                                                                                                                                       \
                                                                                                                                       \
    nonstatic_field(ContiguousSpace,             _top,                                          HeapWord*)                             \
    nonstatic_field(ContiguousSpace,             _concurrent_iteration_safe_limit,              HeapWord*)                             \
    nonstatic_field(ContiguousSpace,             _saved_mark_word,                              HeapWord*)                             \
                                                                                                                                       \
    nonstatic_field(DefNewGeneration,            _next_gen,                                     Generation*)                           \
    nonstatic_field(DefNewGeneration,            _tenuring_threshold,                           uint)                                  \
    nonstatic_field(DefNewGeneration,            _age_table,                                    ageTable)                              \
    nonstatic_field(DefNewGeneration,            _eden_space,                                   EdenSpace*)                            \
    nonstatic_field(DefNewGeneration,            _from_space,                                   ContiguousSpace*)                      \
    nonstatic_field(DefNewGeneration,            _to_space,                                     ContiguousSpace*)                      \
                                                                                                                                       \
    nonstatic_field(EdenSpace,                   _gen,                                          DefNewGeneration*)                     \
                                                                                                                                       \
    nonstatic_field(Generation,                  _reserved,                                     MemRegion)                             \
    nonstatic_field(Generation,                  _virtual_space,                                VirtualSpace)                          \
    nonstatic_field(Generation,                  _level,                                        int)                                   \
    nonstatic_field(Generation,                  _stat_record,                                  Generation::StatRecord)                \
                                                                                                                                       \
    nonstatic_field(Generation::StatRecord,      invocations,                                   int)                                   \
    nonstatic_field(Generation::StatRecord,      accumulated_time,                              elapsedTimer)                          \
                                                                                                                                       \
    nonstatic_field(GenerationSpec,              _name,                                         Generation::Name)                      \
    nonstatic_field(GenerationSpec,              _init_size,                                    size_t)                                \
    nonstatic_field(GenerationSpec,              _max_size,                                     size_t)                                \
                                                                                                                                       \
       static_field(GenCollectedHeap,            _gch,                                          GenCollectedHeap*)                     \
!  nonstatic_field(GenCollectedHeap,             _n_gens,                                       int)                                   \
!  unchecked_nonstatic_field(GenCollectedHeap,   _gens,                                         sizeof(GenCollectedHeap::_gens)) /* NOTE: no type */ \
!   nonstatic_field(GenCollectedHeap,            _gen_specs,                                    GenerationSpec**)                      \
!                                                                                                                                      \
!   nonstatic_field(GenCollectorPolicy,          _young_gen_spec,                               GenerationSpec*)                       \
!   nonstatic_field(GenCollectorPolicy,          _old_gen_spec,                                 GenerationSpec*)                       \
                                                                                                                                       \
    nonstatic_field(HeapWord,                    i,                                             char*)                                 \
                                                                                                                                       \
    nonstatic_field(MemRegion,                   _start,                                        HeapWord*)                             \
    nonstatic_field(MemRegion,                   _word_size,                                    size_t)                                \

*** 1484,1493 ****
--- 1482,1492 ----
    declare_toplevel_type(Generation)                                       \
             declare_type(DefNewGeneration,             Generation)         \
             declare_type(CardGeneration,               Generation)         \
             declare_type(OneContigSpaceCardGeneration, CardGeneration)     \
             declare_type(TenuredGeneration,            OneContigSpaceCardGeneration) \
+   declare_toplevel_type(GenCollectorPolicy)                               \
    declare_toplevel_type(Space)                                            \
    declare_toplevel_type(BitMap)                                           \
             declare_type(CompactibleSpace,             Space)              \
             declare_type(ContiguousSpace,              CompactibleSpace)   \
             declare_type(EdenSpace,                    ContiguousSpace)    \

*** 2235,2246 ****
--- 2234,2243 ----
                                                                            \
    declare_constant(CollectedHeap::Abstract)                               \
    declare_constant(CollectedHeap::SharedHeap)                             \
    declare_constant(CollectedHeap::GenCollectedHeap)                       \
                                                                            \
    declare_constant(GenCollectedHeap::max_gens)                            \
                                                                            \
    /* constants from Generation::Name enum */                              \
                                                                            \
    declare_constant(Generation::DefNew)                                    \
    declare_constant(Generation::MarkSweepCompact)                          \
    declare_constant(Generation::Other)                                     \