Merge pull request #16953 from ehrenjulzert/timed_get_fix

Add error handling to enterContinuationImpl
eclipse-openj9 · Mar 20, 2023 · 6e69d93 · 6e69d93
2 parents 7eec03e + 1921fb3
commit 6e69d93
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/runtime/vm/BytecodeInterpreter.hpp b/runtime/vm/BytecodeInterpreter.hpp
@@ -5248,6 +5248,11 @@ class INTERPRETER_CLASS
 
 		VMStructHasBeenUpdated(REGISTER_ARGS);
 
+		if (immediateAsyncPending()) {
+			rc = GOTO_ASYNC_CHECK;
+		} else if (VM_VMHelpers::exceptionPending(_currentThread)) {
+			rc = GOTO_THROW_CURRENT_EXCEPTION;
+		}
 		return rc;
 	}