src/hotspot/share/runtime/sharedRuntime.cpp

*** 56,10 ***
--- 56,11 ---
  #include "prims/jvmtiThreadState.hpp"
  #include "prims/methodHandles.hpp"
  #include "prims/nativeLookup.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/atomic.hpp"
+ #include "runtime/basicLock.inline.hpp"
  #include "runtime/frame.inline.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
  #include "runtime/java.hpp"

*** 67,17 ***
  #include "runtime/jniHandles.inline.hpp"
  #include "runtime/perfData.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stackWatermarkSet.hpp"
  #include "runtime/stubRoutines.hpp"
! #include "runtime/synchronizer.hpp"
  #include "runtime/vframe.inline.hpp"
  #include "runtime/vframeArray.hpp"
  #include "runtime/vm_version.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/resourceHash.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/xmlstream.hpp"
  #ifdef COMPILER1
  #include "c1/c1_Runtime1.hpp"
--- 68,18 ---
  #include "runtime/jniHandles.inline.hpp"
  #include "runtime/perfData.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stackWatermarkSet.hpp"
  #include "runtime/stubRoutines.hpp"
! #include "runtime/synchronizer.inline.hpp"
  #include "runtime/vframe.inline.hpp"
  #include "runtime/vframeArray.hpp"
  #include "runtime/vm_version.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
+ #include "utilities/globalDefinitions.hpp"
  #include "utilities/resourceHash.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/xmlstream.hpp"
  #ifdef COMPILER1
  #include "c1/c1_Runtime1.hpp"

*** 2951,10 ***
--- 2953,12 ---
            ObjectSynchronizer::inflate_helper(kptr2->obj());
          }
          // Now the displaced header is free to move because the
          // object's header no longer refers to it.
          buf[i] = (intptr_t)lock->displaced_header().value();
+       } else if (UseObjectMonitorTable) {
+         buf[i] = (intptr_t)lock->object_monitor_cache();
        }
  #ifdef ASSERT
        else {
          buf[i] = badDispHeaderOSR;
        }