src/hotspot/share/runtime/vmStructs.cpp

rev 59376 : 8153224.v2.10.patch merged with 8153224.v2.11.patch.

*** 92,101 ****
--- 92,102 ----
  #include "runtime/os.hpp"
  #include "runtime/perfMemory.hpp"
  #include "runtime/serviceThread.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
+ #include "runtime/synchronizer.hpp"
  #include "runtime/thread.inline.hpp"
  #include "runtime/threadSMR.hpp"
  #include "runtime/vframeArray.hpp"
  #include "runtime/vmStructs.hpp"
  #include "utilities/globalDefinitions.hpp"
*** 897,914 ****
    /************/                                                                                                                     \
                                                                                                                                       \
    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,      _contentions,                                  jint)                                  \
    volatile_nonstatic_field(ObjectMonitor,      _waiters,                                      jint)                                  \
    volatile_nonstatic_field(ObjectMonitor,      _recursions,                                   intx)                                  \
-   nonstatic_field(ObjectMonitor,               _next_om,                                      ObjectMonitor*)                        \
-   volatile_nonstatic_field(BasicLock,          _displaced_header,                             markWord)                              \
    nonstatic_field(BasicObjectLock,             _lock,                                         BasicLock)                             \
    nonstatic_field(BasicObjectLock,             _obj,                                          oop)                                   \
!   static_ptr_volatile_field(ObjectSynchronizer, g_block_list,                                 PaddedObjectMonitor*)                  \
                                                                                                                                       \
    /*********************/                                                                                                            \
    /* Matcher (C2 only) */                                                                                                            \
    /*********************/                                                                                                            \
                                                                                                                                       \
--- 898,915 ----
    /************/                                                                                                                     \
                                                                                                                                       \
    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,                                  jint)                                  \
    volatile_nonstatic_field(ObjectMonitor,      _waiters,                                      jint)                                  \
    volatile_nonstatic_field(ObjectMonitor,      _recursions,                                   intx)                                  \
    nonstatic_field(BasicObjectLock,             _lock,                                         BasicLock)                             \
    nonstatic_field(BasicObjectLock,             _obj,                                          oop)                                   \
!   static_field(ObjectSynchronizer,             g_block_list,                                  PaddedObjectMonitor*)                  \
                                                                                                                                       \
    /*********************/                                                                                                            \
    /* Matcher (C2 only) */                                                                                                            \
    /*********************/                                                                                                            \
                                                                                                                                       \