hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp

*** 1353,1362 ****
--- 1353,1367 ----
    __ stlrw(rscratch1, rscratch2);
  
    // reset_last_Java_frame
    __ reset_last_Java_frame(true, true);
  
+   if (CheckJNICalls) {
+     // clear_pending_jni_exception_check
+     __ str(zr, Address(rthread, JavaThread::pending_jni_exception_check_fn_offset());
+   }
+ 
    // reset handle block
    __ ldr(t, Address(rthread, JavaThread::active_handles_offset()));
    __ str(zr, Address(t, JNIHandleBlock::top_offset_in_bytes()));
  
    // If result is an oop unbox and store it in frame where gc will see it