Automatic merge of jdk:master into master

openjdk · Nov 3, 2020 · 7efd38b · 7efd38b
2 parents dcb03cf + 904561e
commit 7efd38b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
@@ -2904,7 +2904,9 @@ BytecodeInterpreter::run(interpreterState istate) {
     // a NULL oop in it and then overwrite the oop later as needed. This isn't
     // unfortunately isn't possible.
 
-    THREAD->clear_pending_exception();
+    if (THREAD->has_pending_exception()) {
+      THREAD->clear_pending_exception();
+    }
 
     //
     // As far as we are concerned we have returned. If we have a pending exception