[Openmp-commits] [openmp] r250727 - Clean-up cancellation state flag between parallel regions

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Mon Oct 19 14:33:38 2015
New Revision: 250727

URL: http://llvm.org/viewvc/llvm-project?rev=250727&view=rev
Log:
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.

Modified:
    openmp/trunk/runtime/src/kmp_runtime.c

Modified: openmp/trunk/runtime/src/kmp_runtime.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_runtime.c?rev=250727&r1=250726&r2=250727&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_runtime.c (original)
+++ openmp/trunk/runtime/src/kmp_runtime.c Mon Oct 19 14:33:38 2015
@@ -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);