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 */                                                                                                                           \
    /******/                                                                                                                           \
                                                                                                                                       \

*** 703,10 ***
--- 702,13 ---
    nonstatic_field(ThreadShadow,                _pending_exception,                            oop)                                   \
    nonstatic_field(ThreadShadow,                _exception_file,                               const char*)                           \
    nonstatic_field(ThreadShadow,                _exception_line,                               int)                                   \
    nonstatic_field(Thread,                      _tlab,                                         ThreadLocalAllocBuffer)                \
    nonstatic_field(Thread,                      _allocated_bytes,                              jlong)                                 \
+   nonstatic_field(Thread,                      _lock_stack,                                   LockStack)                             \
+   nonstatic_field(LockStack,                   _current,                                      oop*)                                  \
+   nonstatic_field(LockStack,                   _base,                                         oop*)                                  \
    nonstatic_field(NamedThread,                 _name,                                         char*)                                 \
    nonstatic_field(NamedThread,                 _processed_thread,                             Thread*)                               \
    nonstatic_field(JavaThread,                  _threadObj,                                    OopHandle)                             \
    nonstatic_field(JavaThread,                  _vthread,                                      OopHandle)                             \
    nonstatic_field(JavaThread,                  _jvmti_vthread,                                OopHandle)                             \

*** 850,15 ***
                                                                                                                                       \
    volatile_nonstatic_field(ObjectMonitor,      _header,                                       markWord)                              \
    unchecked_nonstatic_field(ObjectMonitor,     _object,                                       sizeof(void *)) /* NOTE: no type */    \
    unchecked_nonstatic_field(ObjectMonitor,     _owner,                                        sizeof(void *)) /* NOTE: no type */    \
    volatile_nonstatic_field(ObjectMonitor,      _next_om,                                      ObjectMonitor*)                        \
-   volatile_nonstatic_field(BasicLock,          _displaced_header,                             markWord)                              \
    nonstatic_field(ObjectMonitor,               _contentions,                                  int)                                   \
    volatile_nonstatic_field(ObjectMonitor,      _waiters,                                      int)                                   \
    volatile_nonstatic_field(ObjectMonitor,      _recursions,                                   intx)                                  \
-   nonstatic_field(BasicObjectLock,             _lock,                                         BasicLock)                             \
    nonstatic_field(BasicObjectLock,             _obj,                                          oop)                                   \
    static_field(ObjectSynchronizer,             _in_use_list,                                  MonitorList)                           \
    volatile_nonstatic_field(MonitorList,        _head,                                         ObjectMonitor*)                        \
                                                                                                                                       \
    /*********************/                                                                                                            \
--- 852,13 ---

*** 1317,10 ***
--- 1317,11 ---
    declare_toplevel_type(OSThread)                                         \
    declare_toplevel_type(JavaFrameAnchor)                                  \
                                                                            \
    declare_toplevel_type(ThreadsSMRSupport)                                \
    declare_toplevel_type(ThreadsList)                                      \
+   declare_toplevel_type(LockStack)                                        \
                                                                            \
    /***************/                                                       \
    /* Interpreter */                                                       \
    /***************/                                                       \
                                                                            \

*** 1435,11 ***
    /************/                                                          \
                                                                            \
    declare_toplevel_type(ObjectMonitor)                                    \
    declare_toplevel_type(MonitorList)                                      \
    declare_toplevel_type(ObjectSynchronizer)                               \
-   declare_toplevel_type(BasicLock)                                        \
    declare_toplevel_type(BasicObjectLock)                                  \
                                                                            \
    /*********************/                                                 \
    /* Matcher (C2 only) */                                                 \
    /*********************/                                                 \
--- 1436,10 ---