src/hotspot/share/runtime/vmStructs.cpp

*** 197,12 ***
    /******************************************************************/                                                               \
    /* OopDesc and Klass hierarchies (NOTE: MethodData* incomplete)   */                                                               \
    /******************************************************************/                                                               \
                                                                                                                                       \
    volatile_nonstatic_field(oopDesc,            _mark,                                         markWord)                              \
!   volatile_nonstatic_field(oopDesc,            _metadata._klass,                              Klass*)                                \
-   volatile_nonstatic_field(oopDesc,            _metadata._compressed_klass,                   narrowKlass)                           \
    static_field(BarrierSet,                     _barrier_set,                                  BarrierSet*)                           \
    nonstatic_field(ArrayKlass,                  _dimension,                                    int)                                   \
    volatile_nonstatic_field(ArrayKlass,         _higher_dimension,                             Klass*)                                \
    volatile_nonstatic_field(ArrayKlass,         _lower_dimension,                              Klass*)                                \
    nonstatic_field(CompiledICHolder,            _holder_metadata,                              Metadata*)                             \
--- 197,11 ---
    /******************************************************************/                                                               \
    /* OopDesc and Klass hierarchies (NOTE: MethodData* incomplete)   */                                                               \
    /******************************************************************/                                                               \
                                                                                                                                       \
    volatile_nonstatic_field(oopDesc,            _mark,                                         markWord)                              \
!   NOT_LP64(volatile_nonstatic_field(oopDesc,   _klass,                                        Klass*))                               \
    static_field(BarrierSet,                     _barrier_set,                                  BarrierSet*)                           \
    nonstatic_field(ArrayKlass,                  _dimension,                                    int)                                   \
    volatile_nonstatic_field(ArrayKlass,         _higher_dimension,                             Klass*)                                \
    volatile_nonstatic_field(ArrayKlass,         _lower_dimension,                              Klass*)                                \
    nonstatic_field(CompiledICHolder,            _holder_metadata,                              Metadata*)                             \

*** 377,12 ***
                                                                                                                                       \
    /***************************/                                                                                                      \
    /* CompressedKlassPointers */                                                                                                      \
    /***************************/                                                                                                      \
                                                                                                                                       \
!      static_field(CompressedKlassPointers,     _narrow_klass._base,                           address)                               \
!      static_field(CompressedKlassPointers,     _narrow_klass._shift,                          int)                                   \
                                                                                                                                       \
    /******/                                                                                                                           \
    /* os */                                                                                                                           \
    /******/                                                                                                                           \
                                                                                                                                       \
--- 376,12 ---
                                                                                                                                       \
    /***************************/                                                                                                      \
    /* CompressedKlassPointers */                                                                                                      \
    /***************************/                                                                                                      \
                                                                                                                                       \
!      static_field(CompressedKlassPointers,     _base,                           address)                                             \
!      static_field(CompressedKlassPointers,     _shift_copy,                          int)                                            \
                                                                                                                                       \
    /******/                                                                                                                           \
    /* os */                                                                                                                           \
    /******/                                                                                                                           \
                                                                                                                                       \