hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp

*** 2587,2596 ****
--- 2587,2601 ----
        __ movptr(rax, Address(rax, 0));
        __ bind(L);
        __ verify_oop(rax);
    }
  
+   if (CheckJNICalls) {
+     // clear_pending_jni_exception_check
+     __ movptr(Address(r15_thread, JavaThread::pending_jni_exception_check_fn_offset()), NULL_WORD);
+   }
+ 
    if (!is_critical_native) {
      // reset handle block
      __ movptr(rcx, Address(r15_thread, JavaThread::active_handles_offset()));
      __ movl(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);
    }