src/hotspot/share/runtime/vmStructs.cpp

*** 732,10 ***
--- 732,13 ---
    nonstatic_field(ThreadShadow,                _exception_file,                               const char*)                           \
    nonstatic_field(ThreadShadow,                _exception_line,                               int)                                   \
    nonstatic_field(Thread,                      _active_handles,                               JNIHandleBlock*)                       \
    nonstatic_field(Thread,                      _tlab,                                         ThreadLocalAllocBuffer)                \
    nonstatic_field(Thread,                      _allocated_bytes,                              jlong)                                 \
+   nonstatic_field(JavaThread,                  _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,                  _anchor,                                       JavaFrameAnchor)                       \
    nonstatic_field(JavaThread,                  _vm_result,                                    oop)                                   \

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

*** 2636,10 ***
--- 2640,11 ---
                                                                            \
    declare_constant(markWord::lock_shift)                                  \
    declare_constant(markWord::biased_lock_shift)                           \
    declare_constant(markWord::age_shift)                                   \
    declare_constant(markWord::hash_shift)                                  \
+   LP64_ONLY(declare_constant(markWord::klass_shift))                      \
                                                                            \
    declare_constant(markWord::lock_mask)                                   \
    declare_constant(markWord::lock_mask_in_place)                          \
    declare_constant(markWord::biased_lock_mask)                            \
    declare_constant(markWord::biased_lock_mask_in_place)                   \