Ensure exception safety and task context cleanup in omp_parallel

omp4py/runtime/parallelism.py

@@ -14,9 +14,11 @@ def omp_parallel(num: pyint, f: typing.Callable[[], None], cvars: controlvars.Co
     task.cvars.dataenv = task.cvars.dataenv.__copy__()
     task.cvars.dataenv.thread_num = num
     thread.current().set_parallel(task).set_task(task)
-    f()
-    barrier.task_barrier(task)
-    thread.current().pop_task()
+    try:
+        f()
+    finally:
+        barrier.task_barrier(task)
+        thread.current().pop_task()
 
 
 def parallel_run(f: typing.Callable[[], None], c_if: bool, c_message: str, c_nthreads: tuple[pyint, ...],

test/basic/test_parallel.py

@@ -572,3 +572,25 @@ def test_parallel_copyin():
     assert sorted(q.queue) == [2, 2]
 
 ################################################
+
+
+################################################
+
+
+def parallel_raise_exception():
+    with omp("parallel num_threads(2)"):
+        raise ValueError("Intentional parallel test exception")
+
+
+def parallel_subsequent_region(q: Queue):
+    with omp("parallel num_threads(2)"):
+        q.put(omp_get_thread_num())
+
+
+def test_parallel_exception_cleanup():
+    with pytest.raises(ValueError, match="Intentional parallel test exception"):
+        omp(parallel_raise_exception)()
+
+    q = Queue()
+    omp(parallel_subsequent_region)(q)
+    assert sorted(q.queue) == [0, 1]