summaryrefslogtreecommitdiffstats
path: root/openmp/runtime/src
diff options
context:
space:
mode:
authorAndrey Churbanov <Andrey.Churbanov@intel.com>2017-06-01 18:10:45 +0000
committerAndrey Churbanov <Andrey.Churbanov@intel.com>2017-06-01 18:10:45 +0000
commitb3b10c2fa5e48ee4f9d67df1e2d31c1eb6629a61 (patch)
tree388a37ccf4a1fb59fb97d7eeac5615043580e885 /openmp/runtime/src
parent3cf16576d5f2a4db0a0c679e48119dab570542b1 (diff)
downloadbcm5719-llvm-b3b10c2fa5e48ee4f9d67df1e2d31c1eb6629a61.tar.gz
bcm5719-llvm-b3b10c2fa5e48ee4f9d67df1e2d31c1eb6629a61.zip
Re-enable assertion after the problem that caused it to be hit had been fixed
Differential Revision: https://reviews.llvm.org/D31421 llvm-svn: 304443
Diffstat (limited to 'openmp/runtime/src')
-rw-r--r--openmp/runtime/src/kmp_runtime.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp
index 412f6a22d0c..17ea8eb9637 100644
--- a/openmp/runtime/src/kmp_runtime.cpp
+++ b/openmp/runtime/src/kmp_runtime.cpp
@@ -2043,13 +2043,8 @@ int __kmp_fork_call(ident_t *loc, int gtid,
if (__kmp_tasking_mode != tskm_immediate_exec) {
// Set master's task team to team's task team. Unless this is hot team, it
// should be NULL.
-#if 0
- // Patch out an assertion that trips while the runtime seems to operate
- // correctly. Avoiding the preconditions that cause the assertion to trip
- // has been promised as a forthcoming patch.
KMP_DEBUG_ASSERT(master_th->th.th_task_team ==
parent_team->t.t_task_team[master_th->th.th_task_state]);
-#endif
KA_TRACE(20, ("__kmp_fork_call: Master T#%d pushing task_team %p / team "
"%p, new task_team %p / team %p\n",
__kmp_gtid_from_thread(master_th),
OpenPOWER on IntegriCloud