From 8dc6c95e5f0d00620aa2e434355a25e286895382 Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Fri, 7 Jun 2024 15:33:31 +0000 Subject: [PATCH] add manual leave calls to JL_TRY --- src/scheduler.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/scheduler.c b/src/scheduler.c index 1dac6c22511094..64a6799e1bdfd4 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -465,6 +465,7 @@ JL_DLLEXPORT jl_task_t *jl_task_get_next(jl_value_t *trypoptask, jl_value_t *q, if (set_not_sleeping(ptls)) { JL_PROBE_RT_SLEEP_CHECK_TASK_WAKE(ptls); } + jl_eh_restore_state_noexcept(__eh_ct, &__eh); // leave if (task) return task; continue; @@ -473,6 +474,7 @@ JL_DLLEXPORT jl_task_t *jl_task_get_next(jl_value_t *trypoptask, jl_value_t *q, if (set_not_sleeping(ptls)) { JL_PROBE_RT_SLEEP_CHECK_TASK_WAKE(ptls); } + jl_eh_restore_state_noexcept(__eh_ct, &__eh); // leave return task; } @@ -533,6 +535,7 @@ JL_DLLEXPORT jl_task_t *jl_task_get_next(jl_value_t *trypoptask, jl_value_t *q, JL_PROBE_RT_SLEEP_CHECK_UV_WAKE(ptls); } start_cycles = 0; + jl_eh_restore_state_noexcept(__eh_ct, &__eh); // leave continue; } if (!enter_eventloop && !jl_atomic_load_relaxed(&_threadedregion) && ptls->tid == jl_atomic_load_relaxed(&io_loop_tid)) { @@ -542,6 +545,7 @@ JL_DLLEXPORT jl_task_t *jl_task_get_next(jl_value_t *trypoptask, jl_value_t *q, JL_PROBE_RT_SLEEP_CHECK_UV_WAKE(ptls); } start_cycles = 0; + jl_eh_restore_state_noexcept(__eh_ct, &__eh); // leave continue; } } @@ -596,6 +600,7 @@ JL_DLLEXPORT jl_task_t *jl_task_get_next(jl_value_t *trypoptask, jl_value_t *q, if (task) { assert(task == wait_empty); wait_empty = NULL; + jl_eh_restore_state_noexcept(__eh_ct, &__eh); // leave return task; } }