Merge

Author: AlanBateman

src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp

@@ -190,10 +190,10 @@ void StubAssembler::prologue(const char* name, bool must_gc_arguments) {
 }
 
 void StubAssembler::epilogue(bool use_pop) {
-  // use_pop when this frame may have been frozen on one carrier
-  // thread then thawed on another carrier thread, rendering the fp
-  // register invalid. We must restore the previous FP because it is
-  // used as a call-saved scratch register by compiled code.
+  // Avoid using a leave instruction when this frame may
+  // have been frozen, since the current value of rfp
+  // restored from the stub would be invalid. We still
+  // must restore the rfp value saved on enter though.
   if (use_pop) {
     ldp(rfp, lr, Address(post(sp, 2 * wordSize)));
   } else {

src/hotspot/cpu/x86/c1_Runtime1_x86.cpp

@@ -221,6 +221,10 @@ void StubAssembler::prologue(const char* name, bool must_gc_arguments) {
 }
 
 void StubAssembler::epilogue(bool use_pop) {
+  // Avoid using a leave instruction when this frame may
+  // have been frozen, since the current value of rbp
+  // restored from the stub would be invalid. We still
+  // must restore the rbp value saved on enter though.
   use_pop ? pop(rbp) : leave();
   ret(0);
 }

src/hotspot/share/runtime/continuation.cpp

@@ -139,7 +139,7 @@ int Continuation::try_preempt(JavaThread* target, oop continuation, int preempt_
   assert(!is_continuation_preempted(continuation), "");
   assert(Continuation::continuation_scope(continuation) == java_lang_VirtualThread::vthread_scope(), "");
   assert(!target->has_pending_exception(), "");
-  assert(!target->is_suspended() || target->is_disable_suspend(), "");
+  assert(!target->is_suspended() || target->is_disable_suspend() || target->obj_locker_count() > 0, "");
 
   if (LockingMode == LM_LEGACY) {
     return freeze_unsupported;