src/share/vm/runtime/vmStructs.cpp

*** 1692,1702 ****
    declare_constant(markOopDesc::biased_lock_pattern)                      \
                                                                            \
    declare_constant(markOopDesc::no_hash)                                  \
    declare_constant(markOopDesc::no_hash_in_place)                         \
    declare_constant(markOopDesc::no_lock_in_place)                         \
!   declare_constant(markOopDesc::max_age)
  
    /* NOTE that we do not use the last_entry() macro here; it is used   */
    /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and */
    /* must be present there)                                            */
  
--- 1692,1714 ----
    declare_constant(markOopDesc::biased_lock_pattern)                      \
                                                                            \
    declare_constant(markOopDesc::no_hash)                                  \
    declare_constant(markOopDesc::no_hash_in_place)                         \
    declare_constant(markOopDesc::no_lock_in_place)                         \
!   declare_constant(markOopDesc::max_age)                                  \
!                                                                           \
!   /* Constants in markOop used by CMS. */                                 \
!   declare_constant(markOopDesc::cms_bits)                                 \
!   declare_constant(markOopDesc::cms_shift)                                \
!   declare_constant(markOopDesc::cms_mask)                                 \
!   declare_constant(markOopDesc::cms_mask_in_place)                        \
!   declare_constant(markOopDesc::cms_free_chunk_pattern)                   \
!   declare_constant(markOopDesc::cms_no_coalesce_pattern)                  \
!   declare_constant(markOopDesc::size_shift)                               \
!   declare_constant(markOopDesc::size_bits)                                \
!   declare_constant(markOopDesc::size_mask)                                \
!   declare_constant(markOopDesc::size_mask_in_place)
  
    /* NOTE that we do not use the last_entry() macro here; it is used   */
    /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and */
    /* must be present there)                                            */
  
*** 1956,1965 ****
--- 1968,1978 ----
  #ifndef SERIALGC
    VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
                          GENERATE_STATIC_VM_STRUCT_ENTRY)
  
    VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
+                  GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
                   GENERATE_STATIC_VM_STRUCT_ENTRY)
  #endif // SERIALGC
  
    VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
                   GENERATE_STATIC_VM_STRUCT_ENTRY, \
*** 2097,2106 ****
--- 2110,2120 ----
  #ifndef SERIALGC
    VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
               CHECK_STATIC_VM_STRUCT_ENTRY);
  
    VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
+              CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
               CHECK_STATIC_VM_STRUCT_ENTRY);
  #endif // SERIALGC
  
    VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                   CHECK_STATIC_VM_STRUCT_ENTRY,
*** 2201,2210 ****
--- 2215,2225 ----
                          CHECK_SENTINEL));
  #ifndef SERIALGC
    debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \
                                     ENSURE_FIELD_TYPE_PRESENT));
    debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \
+                             ENSURE_FIELD_TYPE_PRESENT, \
                              ENSURE_FIELD_TYPE_PRESENT));
  #endif // SERIALGC
    debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \
                              ENSURE_FIELD_TYPE_PRESENT, \
                              CHECK_NO_OP, \