src/hotspot/share/jvmci/vmStructs_jvmci.cpp

@@ -214,13 +214,16 @@
    nonstatic_field(JavaThread,                  _should_post_on_exceptions_flag,               int)                                   \
    nonstatic_field(JavaThread,                  _jni_environment,                              JNIEnv)                                \
    nonstatic_field(JavaThread,                  _poll_data,                                    SafepointMechanism::ThreadData)        \
    nonstatic_field(JavaThread,                  _stack_overflow_state._reserved_stack_activation, address)                            \
    nonstatic_field(JavaThread,                  _held_monitor_count,                           int64_t)                               \
+   nonstatic_field(JavaThread,                  _lock_stack,                                   LockStack)                             \
    JVMTI_ONLY(nonstatic_field(JavaThread,       _is_in_VTMS_transition,                        bool))                                 \
    JVMTI_ONLY(nonstatic_field(JavaThread,       _is_in_tmp_VTMS_transition,                    bool))                                 \
                                                                                                                                       \
+   nonstatic_field(LockStack,                   _top,                                          uint32_t)                              \
+                                                                                                                                      \
    JVMTI_ONLY(static_field(JvmtiVTMSTransitionDisabler, _VTMS_notify_jvmti_events,             bool))                                 \
                                                                                                                                       \
    static_field(java_lang_Class,                _klass_offset,                                 int)                                   \
    static_field(java_lang_Class,                _array_klass_offset,                           int)                                   \
                                                                                                                                       \

@@ -491,10 +494,11 @@
    declare_constant(BitData::exception_seen_flag)                          \
    declare_constant(BitData::null_seen_flag)                               \
    declare_constant(BranchData::not_taken_off_set)                         \
                                                                            \
    declare_constant_with_value("CardTable::dirty_card", CardTable::dirty_card_val()) \
+   declare_constant_with_value("LockStack::_end_offset", LockStack::end_offset()) \
                                                                            \
    declare_constant(CodeInstaller::VERIFIED_ENTRY)                         \
    declare_constant(CodeInstaller::UNVERIFIED_ENTRY)                       \
    declare_constant(CodeInstaller::OSR_ENTRY)                              \
    declare_constant(CodeInstaller::EXCEPTION_HANDLER_ENTRY)                \

@@ -675,10 +679,14 @@
                                                                            \
    declare_constant(InstanceKlass::linked)                                 \
    declare_constant(InstanceKlass::being_initialized)                      \
    declare_constant(InstanceKlass::fully_initialized)                      \
                                                                            \
+   declare_constant(LockingMode::LM_MONITOR)                               \
+   declare_constant(LockingMode::LM_LEGACY)                                \
+   declare_constant(LockingMode::LM_LIGHTWEIGHT)                           \
+                                                                           \
    /*********************************/                                     \
    /* InstanceKlass _misc_flags */                                         \
    /*********************************/                                     \
                                                                            \
    declare_constant(InstanceKlassFlags::_misc_has_nonstatic_concrete_methods)   \

@@ -722,10 +730,12 @@
                                                                            \
    AARCH64_ONLY(declare_constant(NMethodPatchingType::stw_instruction_and_data_patch))  \
    AARCH64_ONLY(declare_constant(NMethodPatchingType::conc_instruction_and_data_patch)) \
    AARCH64_ONLY(declare_constant(NMethodPatchingType::conc_data_patch))                 \
                                                                            \
+   declare_constant(ObjectMonitor::ANONYMOUS_OWNER)                        \
+                                                                           \
    declare_constant(ReceiverTypeData::nonprofiled_count_off_set)           \
    declare_constant(ReceiverTypeData::receiver_type_row_cell_count)        \
    declare_constant(ReceiverTypeData::receiver0_offset)                    \
    declare_constant(ReceiverTypeData::count0_offset)                       \
                                                                            \