diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-10-19 19:33:38 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-10-19 19:33:38 +0000 |
| commit | 45ca5dada1517b20b189e9833e00ef31b36135ed (patch) | |
| tree | 1f745db3ef1f5aacabfef9a5671fc74bf8247c0b /openmp/runtime/src | |
| parent | faf5187ee087b8cdcca3a7464d0e22da6d5091e6 (diff) | |
| download | bcm5719-llvm-45ca5dada1517b20b189e9833e00ef31b36135ed.tar.gz bcm5719-llvm-45ca5dada1517b20b189e9833e00ef31b36135ed.zip | |
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
Diffstat (limited to 'openmp/runtime/src')
| -rw-r--r-- | openmp/runtime/src/kmp_runtime.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); |
