add manual leave calls to JL_TRY

JuliaLang · Jun 7, 2024 · 8dc6c95 · 8dc6c95
1 parent ff412d5
commit 8dc6c95
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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;
                 }
             }