From 45ca5dada1517b20b189e9833e00ef31b36135ed Mon Sep 17 00:00:00 2001 From: Jonathan Peyton Date: Mon, 19 Oct 2015 19:33:38 +0000 Subject: Clean-up cancellation state flag between parallel regions Without this fix, cancellation requests in one parallel region cause cancellation of the second region even though the second one was not intended to be cancelled. llvm-svn: 250727 --- openmp/runtime/src/kmp_runtime.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'openmp/runtime/src/kmp_runtime.c') diff --git a/openmp/runtime/src/kmp_runtime.c b/openmp/runtime/src/kmp_runtime.c index 4743efce56f..6e6334ea92d 100644 --- a/openmp/runtime/src/kmp_runtime.c +++ b/openmp/runtime/src/kmp_runtime.c @@ -2083,6 +2083,10 @@ __kmp_fork_call( #endif /* OMP_40_ENABLED */ team->t.t_sched = get__sched_2(parent_team, master_tid); // set master's schedule as new run-time schedule +#if OMP_40_ENABLED + team->t.t_cancel_request = cancel_noreq; +#endif + // Update the floating point rounding in the team if required. propagateFPControl(team); -- cgit v1.2.3