From e39d4e3e7fb9815bf094e7321d1d73d00275831a Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Sun, 21 Aug 2022 12:57:10 +0100 Subject: fix(core/runtime): always cancel termination in exception handling (#15514) --- core/runtime.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'core') diff --git a/core/runtime.rs b/core/runtime.rs index def38e1eb..68c3ab002 100644 --- a/core/runtime.rs +++ b/core/runtime.rs @@ -1156,14 +1156,14 @@ pub(crate) fn exception_to_err_result<'s, T>( ) -> Result { let state_rc = JsRuntime::state(scope); - let is_terminating_exception = scope.is_execution_terminating(); + let was_terminating_execution = scope.is_execution_terminating(); + // If TerminateExecution was called, cancel isolate termination so that the + // exception can be created. Note that `scope.is_execution_terminating()` may + // have returned false if TerminateExecution was indeed called but there was + // no JS to execute after the call. + scope.cancel_terminate_execution(); let mut exception = exception; - - if is_terminating_exception { - // TerminateExecution was called. Cancel isolate termination so that the - // exception can be created.. - scope.cancel_terminate_execution(); - + { // If the termination is the result of a `Deno.core.terminate` call, we want // to use the exception that was passed to it rather than the exception that // was passed to this function. @@ -1191,8 +1191,8 @@ pub(crate) fn exception_to_err_result<'s, T>( ); } - if is_terminating_exception { - // Re-enable exception termination. + if was_terminating_execution { + // Resume exception termination. scope.terminate_execution(); } @@ -3448,7 +3448,7 @@ assertEquals(1, notify_return_value); Deno.core.ops.op_set_promise_reject_callback((type, promise, reason) => { Deno.core.ops.op_promise_reject(); }); - + throw new Error('top level throw'); "#; -- cgit v1.2.3