src/hotspot/share/runtime/sharedRuntime.cpp

rev 58110 : v2.09a with 8235795, 8235931 and 8236035 extracted; rebased to jdk-14+28; merge with 8236035.patch.cr1; merge with 8235795.patch.cr1; merge with 8236035.patch.cr2; merge with 8235795.patch.cr2; merge with 8235795.patch.cr3.

*** 61,72 ****
--- 61,74 ----
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/javaCalls.hpp"
+ #include "runtime/objectMonitor.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
+ #include "runtime/synchronizer.hpp"
  #include "runtime/vframe.inline.hpp"
  #include "runtime/vframeArray.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
*** 3084,3096 ****
    for (BasicObjectLock *kptr2 = fr.interpreter_frame_monitor_end();
         kptr2 < fr.interpreter_frame_monitor_begin();
         kptr2 = fr.next_monitor_in_interpreter_frame(kptr2) ) {
      if (kptr2->obj() != NULL) {         // Avoid 'holes' in the monitor array
        BasicLock *lock = kptr2->lock();
        // Inflate so the displaced header becomes position-independent
!       if (lock->displaced_header().is_unlocked())
!         ObjectSynchronizer::inflate_helper(kptr2->obj());
        // Now the displaced header is free to move
        buf[i++] = (intptr_t)lock->displaced_header().value();
        buf[i++] = cast_from_oop<intptr_t>(kptr2->obj());
      }
    }
--- 3086,3102 ----
    for (BasicObjectLock *kptr2 = fr.interpreter_frame_monitor_end();
         kptr2 < fr.interpreter_frame_monitor_begin();
         kptr2 = fr.next_monitor_in_interpreter_frame(kptr2) ) {
      if (kptr2->obj() != NULL) {         // Avoid 'holes' in the monitor array
        BasicLock *lock = kptr2->lock();
+       // Disallow async deflation of the inflated monitor so the
+       // displaced header stays stable until we've copied it.
+       ObjectMonitorHandle omh;
        // Inflate so the displaced header becomes position-independent
!       if (lock->displaced_header().is_unlocked()) {
!         ObjectSynchronizer::inflate_helper(&omh, kptr2->obj());
!       }
        // Now the displaced header is free to move
        buf[i++] = (intptr_t)lock->displaced_header().value();
        buf[i++] = cast_from_oop<intptr_t>(kptr2->obj());
      }
    }