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

*** 1167,1176 ****
--- 1167,1181 ----
    __ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_Java);
  
    // reset_last_Java_frame
    __ reset_last_Java_frame(thread, true, true);
  
+   if (CheckJNICalls) {
+     // clear_pending_jni_exception_check
+     __ movptr(Address(thread, JavaThread::pending_jni_exception_check_fn_offset()), NULL_WORD);
+   }
+ 
    // reset handle block
    __ movptr(t, Address(thread, JavaThread::active_handles_offset()));
    __ movl(Address(t, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);
  
    // If result is an oop unbox and store it in frame where gc will see it