src/hotspot/share/runtime/vmStructs.cpp

@@ -375,12 +375,12 @@
                                                                                                                                       \
    /***************************/                                                                                                      \
    /* CompressedKlassPointers */                                                                                                      \
    /***************************/                                                                                                      \
                                                                                                                                       \
-      static_field(CompressedKlassPointers,     _narrow_klass._base,                           address)                               \
-      static_field(CompressedKlassPointers,     _narrow_klass._shift,                          int)                                   \
+      static_field(CompressedKlassPointers,     _base,                           address)                                             \
+      static_field(CompressedKlassPointers,     _shift_copy,                          int)                                            \
                                                                                                                                       \
    /**********/                                                                                                                       \
    /* Memory */                                                                                                                       \
    /**********/                                                                                                                       \
                                                                                                                                       \

@@ -697,10 +697,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(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,                  _vthread,                                      OopHandle)                             \
    nonstatic_field(JavaThread,                  _jvmti_vthread,                                OopHandle)                             \

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

@@ -2600,10 +2604,11 @@
    declare_constant(markWord::hash_bits)                                   \
                                                                            \
    declare_constant(markWord::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::age_mask)                                    \
    declare_constant(markWord::age_mask_in_place)                           \