--- old/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp 2016-08-19 12:32:32.574539366 +0200 +++ new/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp 2016-08-19 12:32:32.426536053 +0200 @@ -2589,6 +2589,11 @@ __ 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()));