src/hotspot/share/jvmci/vmStructs_jvmci.cpp

@@ -134,11 +134,11 @@
    unchecked_nonstatic_field(Array<u1>,         _data,                                  sizeof(u1))                                   \
    unchecked_nonstatic_field(Array<u2>,         _data,                                  sizeof(u2))                                   \
    nonstatic_field(Array<Klass*>,               _length,                                int)                                          \
    nonstatic_field(Array<Klass*>,               _data[0],                               Klass*)                                       \
                                                                                                                                       \
-   volatile_nonstatic_field(BasicLock,          _displaced_header,                      markWord)                                     \
+   volatile_nonstatic_field(BasicLock,          _metadata,                              uintptr_t)                                    \
                                                                                                                                       \
    static_field(CodeCache,                      _low_bound,                             address)                                      \
    static_field(CodeCache,                      _high_bound,                            address)                                      \
                                                                                                                                       \
    nonstatic_field(CollectedHeap,               _total_collections,                     unsigned int)                                 \

@@ -457,11 +457,10 @@
    declare_constant(CompLevel_limited_profile)                             \
    declare_constant(CompLevel_full_profile)                                \
    declare_constant(CompLevel_full_optimization)                           \
    declare_constant(HeapWordSize)                                          \
    declare_constant(InvocationEntryBci)                                    \
-   declare_constant(LogKlassAlignmentInBytes)                              \
    declare_constant(JVMCINMethodData::SPECULATION_LENGTH_BITS)             \
                                                                            \
    declare_constant(JVM_ACC_WRITTEN_FLAGS)                                 \
    declare_constant(JVM_ACC_HAS_FINALIZER)                                 \
    declare_constant(JVM_ACC_IS_CLONEABLE_FAST)                             \