src/hotspot/share/code/nmethod.cpp

@@ -706,11 +706,11 @@
      return;
    }
  
    // handle the case of an anchor explicitly set in continuation code that doesn't have a callee
    JavaThread* thread = reg_map->thread();
-   if (thread->has_last_Java_frame() && fr.sp() == thread->last_Java_sp()) {
+   if ((thread->has_last_Java_frame() && fr.sp() == thread->last_Java_sp()) JVMTI_ONLY(|| (method()->is_continuation_enter_intrinsic() && thread->on_monitor_waited_event()))) {
      return;
    }
  
    if (!method()->is_native()) {
      address pc = fr.pc();

@@ -1296,11 +1296,11 @@
      _entry_bci               = InvocationEntryBci;
      _compile_id              = compile_id;
      _comp_level              = CompLevel_none;
      _compiler_type           = type;
      _orig_pc_offset          = 0;
-     _num_stack_arg_slots     = _method->constMethod()->num_stack_arg_slots();
+     _num_stack_arg_slots     = 0;
  
      if (offsets->value(CodeOffsets::Exceptions) != -1) {
        // Continuation enter intrinsic
        _exception_offset      = code_offset() + offsets->value(CodeOffsets::Exceptions);
      } else {