From b3b10c2fa5e48ee4f9d67df1e2d31c1eb6629a61 Mon Sep 17 00:00:00 2001 From: Andrey Churbanov Date: Thu, 1 Jun 2017 18:10:45 +0000 Subject: 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 --- openmp/runtime/src/kmp_runtime.cpp | 5 ----- 1 file changed, 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), -- cgit v1.2.3