src/hotspot/share/runtime/javaThread.cpp

@@ -96,10 +96,11 @@
  #include "services/threadService.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
+ #include "utilities/globalDefinitions.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/preserveException.hpp"
  #include "utilities/spinYield.hpp"
  #include "utilities/vmError.hpp"
  #if INCLUDE_JVMCI

@@ -502,11 +503,12 @@
  
    _class_to_be_initialized(nullptr),
  
    _SleepEvent(ParkEvent::Allocate(this)),
  
-   _lock_stack(this) {
+   _lock_stack(this),
+   _om_cache(this) {
    set_jni_functions(jni_functions());
  
  #if INCLUDE_JVMCI
    assert(_jvmci._implicit_exception_pc == nullptr, "must be");
    if (JVMCICounterSize > 0) {

@@ -803,10 +805,12 @@
    elapsedTimer _timer_exit_phase1;
    elapsedTimer _timer_exit_phase2;
    elapsedTimer _timer_exit_phase3;
    elapsedTimer _timer_exit_phase4;
  
+   om_clear_monitor_cache();
+ 
    if (log_is_enabled(Debug, os, thread, timer)) {
      _timer_exit_phase1.start();
    }
  
    HandleMark hm(this);