src/hotspot/share/runtime/deoptimization.cpp

*** 54,63 ****
--- 54,64 ----
  #include "runtime/threadSMR.hpp"
  #include "runtime/vframe.hpp"
  #include "runtime/vframeArray.hpp"
  #include "runtime/vframe_hp.hpp"
  #include "utilities/events.hpp"
+ #include "utilities/preserveException.hpp"
  #include "utilities/xmlstream.hpp"
  
  #if INCLUDE_JVMCI
  #include "jvmci/jvmciRuntime.hpp"
  #include "jvmci/jvmciJavaClasses.hpp"
*** 646,655 ****
--- 647,658 ----
    cleanup_deopt_info(thread, array);
  
  #ifndef PRODUCT
    if (VerifyStack) {
      ResourceMark res_mark;
+     // Clear pending exception to not break verification code (restored afterwards)
+     PRESERVE_EXCEPTION_MARK;
  
      thread->validate_frame_layout();
  
      // Verify that the just-unpacked frames match the interpreter's
      // notions of expression stack and locals