src/cpu/x86/vm/sharedRuntime_x86_64.cpp

rev 6361 : imported patch 8041934-method_exit

*** 2482,2491 ****
--- 2482,2514 ----
      }
  
      __ bind(done);
  
    }
+ 
+   {
+     // Normally we do not post method_entry and method_exit events from
+     // compiled code, only from the interpreter. If method_entry/exit
+     // events are switched on at runtime, we will deoptimize everything
+     // (see VM_EnterInterpOnlyMode) on the stack and call method_entry/exit
+     // from the interpreter. But when we do that, we will not deoptimize
+     // this native wrapper frame. Thus we have an extra check here to see
+     // if we are now in interp_only_mode and in that case we do the jvmti
+     // callback.
+     Label skip_jvmti_method_exit;
+     __ cmpb(Address(r15_thread, JavaThread::interp_only_mode_offset()), 0);
+     __ jccb(Assembler::zero, skip_jvmti_method_exit);
+ 
+     save_native_result(masm, ret_type, stack_slots);
+     __ mov_metadata(c_rarg1, method());
+     __ call_VM_leaf(
+          CAST_FROM_FN_PTR(address, SharedRuntime::jvmti_method_exit),
+          r15_thread, c_rarg1);
+     restore_native_result(masm, ret_type, stack_slots);
+     __ bind(skip_jvmti_method_exit);
+   }
+ 
    {
      SkipIfEqual skip(masm, &DTraceMethodProbes, false);
      save_native_result(masm, ret_type, stack_slots);
      __ mov_metadata(c_rarg1, method());
      __ call_VM_leaf(