src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -741,17 +741,14 @@
    if (c_rarg3 != arg ) {
      masm->mov(c_rarg3, arg);
    }
  }
  
- static bool is_preemptable(address entry_point) {
-   return entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter);
- }
- 
  void MacroAssembler::call_VM_base(Register oop_result,
                                    Register java_thread,
                                    Register last_java_sp,
+                                   Label*   return_pc,
                                    address  entry_point,
                                    int      number_of_arguments,
                                    bool     check_exceptions) {
     // determine java_thread register
    if (!java_thread->is_valid()) {

@@ -780,16 +777,11 @@
  
    // set last Java frame before call
    assert(last_java_sp != rfp, "can't use rfp");
  
    Label l;
-   if (is_preemptable(entry_point)) {
-     // skip setting last_pc since we already set it to desired value.
-     set_last_Java_frame(last_java_sp, rfp, noreg, rscratch1);
-   } else {
-     set_last_Java_frame(last_java_sp, rfp, l, rscratch1);
-   }
+   set_last_Java_frame(last_java_sp, rfp, return_pc != nullptr ? *return_pc : l, rscratch1);
  
    // do the call, remove parameters
    MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
  
    // lr could be poisoned with PAC signature during throw_pending_exception

@@ -820,11 +812,11 @@
      get_vm_result_oop(oop_result, java_thread);
    }
  }
  
  void MacroAssembler::call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions) {
-   call_VM_base(oop_result, noreg, noreg, entry_point, number_of_arguments, check_exceptions);
+   call_VM_base(oop_result, noreg, noreg, nullptr, entry_point, number_of_arguments, check_exceptions);
  }
  
  // Check the entry target is always reachable from any branch.
  static bool is_always_within_branch_range(Address entry) {
    if (AOTCodeCache::is_on_for_dump()) {

@@ -1078,11 +1070,11 @@
  void MacroAssembler::call_VM(Register oop_result,
                               Register last_java_sp,
                               address entry_point,
                               int number_of_arguments,
                               bool check_exceptions) {
-   call_VM_base(oop_result, rthread, last_java_sp, entry_point, number_of_arguments, check_exceptions);
+   call_VM_base(oop_result, rthread, last_java_sp, nullptr, entry_point, number_of_arguments, check_exceptions);
  }
  
  void MacroAssembler::call_VM(Register oop_result,
                               Register last_java_sp,
                               address entry_point,