Guard stub generation and held_monitor_count in the interpreter with Continuations::enabled()

Author: pron

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -314,6 +314,7 @@ void MacroAssembler::safepoint_poll(Label& slow_path, bool at_return, bool acqui
 }
 
 void MacroAssembler::push_cont_fastpath(Register java_thread) {
+  if (!Continuations::enabled()) return;
   Label done;
   ldr(rscratch1, Address(java_thread, JavaThread::cont_fastpath_offset()));
   cmp(sp, rscratch1);
@@ -324,6 +325,7 @@ void MacroAssembler::push_cont_fastpath(Register java_thread) {
 }
 
 void MacroAssembler::pop_cont_fastpath(Register java_thread) {
+  if (!Continuations::enabled()) return;
   Label done;
   ldr(rscratch1, Address(java_thread, JavaThread::cont_fastpath_offset()));
   cmp(sp, rscratch1);
@@ -333,10 +335,12 @@ void MacroAssembler::pop_cont_fastpath(Register java_thread) {
 }
 
 void MacroAssembler::inc_held_monitor_count(Register java_thread) {
+  if (!Continuations::enabled()) return;
   incrementw(Address(java_thread, JavaThread::held_monitor_count_offset()));
 }
 
 void MacroAssembler::dec_held_monitor_count(Register java_thread) {
+  if (!Continuations::enabled()) return;
   decrementw(Address(java_thread, JavaThread::held_monitor_count_offset()));
 }
 

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -6518,7 +6518,9 @@ class StubGenerator: public StubCodeGenerator {
   }
 #endif // LINUX
 
-RuntimeStub* generate_cont_doYield() {
+  RuntimeStub* generate_cont_doYield() {
+    if (!Continuations::enabled()) return nullptr;
+
     const char *name = "cont_doYield";
 
     enum layout {
@@ -6580,6 +6582,8 @@ RuntimeStub* generate_cont_doYield() {
   }
 
   address generate_cont_jump_from_safepoint() {
+    if (!Continuations::enabled()) return nullptr;
+
     __ align(CodeEntryAlignment);
     StubCodeMark mark(this, "StubRoutines","Continuation jump from safepoint");
 
@@ -6694,13 +6698,17 @@ RuntimeStub* generate_cont_doYield() {
   }
 
   address generate_cont_thaw() {
+    if (!Continuations::enabled()) return nullptr;
+
     StubCodeMark mark(this, "StubRoutines", "Cont thaw");
     address start = __ pc();
     generate_cont_thaw(false, false);
     return start;
   }
 
   address generate_cont_returnBarrier() {
+    if (!Continuations::enabled()) return nullptr;
+
     // TODO: will probably need multiple return barriers depending on return type
     StubCodeMark mark(this, "StubRoutines", "cont return barrier");
     address start = __ pc();
@@ -6711,6 +6719,8 @@ RuntimeStub* generate_cont_doYield() {
   }
 
   address generate_cont_returnBarrier_exception() {
+    if (!Continuations::enabled()) return nullptr;
+
     StubCodeMark mark(this, "StubRoutines", "cont return barrier exception handler");
     address start = __ pc();
 
@@ -6720,28 +6730,30 @@ RuntimeStub* generate_cont_doYield() {
   }
 
   address generate_cont_interpreter_forced_preempt_return() {
-      StubCodeMark mark(this, "StubRoutines", "cont interpreter forced preempt return");
-      address start = __ pc();
+    if (!Continuations::enabled()) return nullptr;
 
-      // This is necessary for forced yields, as the return addres (in rbx) is captured in a call_VM, and skips the restoration of rbcp and locals
+    StubCodeMark mark(this, "StubRoutines", "cont interpreter forced preempt return");
+    address start = __ pc();
 
-      assert_asm(_masm, __ cmp(sp, rfp), Assembler::EQ, "sp != fp"); // __ mov(rfp, sp);
-      __ leave(); // we're now on the last thawed frame
+    // This is necessary for forced yields, as the return addres (in rbx) is captured in a call_VM, and skips the restoration of rbcp and locals
 
-      __ ldr(rbcp,    Address(rfp, frame::interpreter_frame_bcp_offset    * wordSize)); // InterpreterMacroAssembler::restore_bcp()
-      __ ldr(rlocals, Address(rfp, frame::interpreter_frame_locals_offset * wordSize)); // InterpreterMacroAssembler::restore_locals()
-      __ ldr(rcpool,  Address(rfp, frame::interpreter_frame_cache_offset  * wordSize)); // InterpreterMacroAssembler::restore_constant_pool_cache()
-      __ ldr(rmethod, Address(rfp, frame::interpreter_frame_method_offset * wordSize)); // InterpreterMacroAssembler::get_method(rmethod) -- might not be necessary
-      // __ reinit_heapbase();
+    assert_asm(_masm, __ cmp(sp, rfp), Assembler::EQ, "sp != fp"); // __ mov(rfp, sp);
+    __ leave(); // we're now on the last thawed frame
 
-      // Restore stack bottom in case i2c adjusted stack and NULL it as marker that esp is now tos until next java call
-      __ ldr(esp, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
-      __ str(zr,  Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
+    __ ldr(rbcp,    Address(rfp, frame::interpreter_frame_bcp_offset    * wordSize)); // InterpreterMacroAssembler::restore_bcp()
+    __ ldr(rlocals, Address(rfp, frame::interpreter_frame_locals_offset * wordSize)); // InterpreterMacroAssembler::restore_locals()
+    __ ldr(rcpool,  Address(rfp, frame::interpreter_frame_cache_offset  * wordSize)); // InterpreterMacroAssembler::restore_constant_pool_cache()
+    __ ldr(rmethod, Address(rfp, frame::interpreter_frame_method_offset * wordSize)); // InterpreterMacroAssembler::get_method(rmethod) -- might not be necessary
+    // __ reinit_heapbase();
 
-      __ ret(lr);
+    // Restore stack bottom in case i2c adjusted stack and NULL it as marker that esp is now tos until next java call
+    __ ldr(esp, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
+    __ str(zr,  Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
 
-      return start;
-    }
+    __ ret(lr);
+
+    return start;
+  }
 
 #if INCLUDE_JFR
 

src/hotspot/cpu/x86/macroAssembler_x86.cpp

@@ -2899,6 +2899,7 @@ void MacroAssembler::push_IU_state() {
 }
 
 void MacroAssembler::push_cont_fastpath(Register java_thread) {
+  if (!Continuations::enabled()) return;
   Label done;
   cmpptr(rsp, Address(java_thread, JavaThread::cont_fastpath_offset()));
   jccb(Assembler::belowEqual, done);
@@ -2907,6 +2908,7 @@ void MacroAssembler::push_cont_fastpath(Register java_thread) {
 }
 
 void MacroAssembler::pop_cont_fastpath(Register java_thread) {
+  if (!Continuations::enabled()) return;
   Label done;
   cmpptr(rsp, Address(java_thread, JavaThread::cont_fastpath_offset()));
   jccb(Assembler::below, done);
@@ -2915,10 +2917,12 @@ void MacroAssembler::pop_cont_fastpath(Register java_thread) {
 }
 
 void MacroAssembler::inc_held_monitor_count(Register java_thread) {
+  if (!Continuations::enabled()) return;
   incrementl(Address(java_thread, JavaThread::held_monitor_count_offset()));
 }
 
 void MacroAssembler::dec_held_monitor_count(Register java_thread) {
+  if (!Continuations::enabled()) return;
   decrementl(Address(java_thread, JavaThread::held_monitor_count_offset()));
 }
 

src/hotspot/cpu/x86/stubGenerator_x86_64.cpp

@@ -7465,7 +7465,9 @@ address generate_avx_ghash_processBlocks() {
 
   }
 
-RuntimeStub* generate_cont_doYield() {
+  RuntimeStub* generate_cont_doYield() {
+    if (!Continuations::enabled()) return nullptr;
+
     const char *name = "cont_doYield";
 
     enum layout {
@@ -7529,6 +7531,8 @@ RuntimeStub* generate_cont_doYield() {
   }
 
   address generate_cont_jump_from_safepoint() {
+    if (!Continuations::enabled()) return nullptr;
+
     StubCodeMark mark(this, "StubRoutines","Continuation jump from safepoint");
 
     address start = __ pc();
@@ -7621,13 +7625,17 @@ RuntimeStub* generate_cont_doYield() {
   }
 
   address generate_cont_thaw() {
+    if (!Continuations::enabled()) return nullptr;
+
     StubCodeMark mark(this, "StubRoutines", "Cont thaw");
     address start = __ pc();
     generate_cont_thaw(false, false);
     return start;
   }
 
   address generate_cont_returnBarrier() {
+    if (!Continuations::enabled()) return nullptr;
+
     // TODO: will probably need multiple return barriers depending on return type
     StubCodeMark mark(this, "StubRoutines", "cont return barrier");
     address start = __ pc();
@@ -7638,6 +7646,8 @@ RuntimeStub* generate_cont_doYield() {
   }
 
   address generate_cont_returnBarrier_exception() {
+    if (!Continuations::enabled()) return nullptr;
+
     StubCodeMark mark(this, "StubRoutines", "cont return barrier exception handler");
     address start = __ pc();
 
@@ -7647,25 +7657,26 @@ RuntimeStub* generate_cont_doYield() {
   }
 
   address generate_cont_interpreter_forced_preempt_return() {
-      StubCodeMark mark(this, "StubRoutines", "cont interpreter forced preempt return");
-      address start = __ pc();
+    if (!Continuations::enabled()) return nullptr;
+    StubCodeMark mark(this, "StubRoutines", "cont interpreter forced preempt return");
+    address start = __ pc();
 
-      // This is necessary for forced yields, as the return addres (in rbx) is captured in a call_VM, and skips the restoration of rbcp and locals
-      // see InterpreterMacroAssembler::restore_bcp/restore_locals
-      // TODO: use InterpreterMacroAssembler
-      static const Register _locals_register = r14;
-      static const Register _bcp_register    = r13;
+    // This is necessary for forced yields, as the return addres (in rbx) is captured in a call_VM, and skips the restoration of rbcp and locals
+    // see InterpreterMacroAssembler::restore_bcp/restore_locals
+    // TODO: use InterpreterMacroAssembler
+    static const Register _locals_register = r14;
+    static const Register _bcp_register    = r13;
 
-      __ pop(rbp);
+    __ pop(rbp);
 
-      __ movptr(_bcp_register,    Address(rbp, frame::interpreter_frame_bcp_offset    * wordSize));
-      __ movptr(_locals_register, Address(rbp, frame::interpreter_frame_locals_offset * wordSize));
-      // __ reinit_heapbase();
+    __ movptr(_bcp_register,    Address(rbp, frame::interpreter_frame_bcp_offset    * wordSize));
+    __ movptr(_locals_register, Address(rbp, frame::interpreter_frame_locals_offset * wordSize));
+    // __ reinit_heapbase();
 
-      __ ret(0);
+    __ ret(0);
 
-      return start;
-    }
+    return start;
+  }
 
 #if INCLUDE_JFR