[Openmp-commits] [openmp] r304443 - Re-enable assertion after the problem that caused it to be hit had been fixed

[Andrey Churbanov via Openmp-commits]

Author: achurbanov
Date: Thu Jun  1 13:10:45 2017
New Revision: 304443

URL: http://llvm.org/viewvc/llvm-project?rev=304443&view=rev
Log:
Re-enable assertion after the problem that caused it to be hit had been fixed

Differential Revision: https://reviews.llvm.org/D31421

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

Modified: openmp/trunk/runtime/src/kmp_runtime.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_runtime.cpp?rev=304443&r1=304442&r2=304443&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_runtime.cpp (original)
+++ openmp/trunk/runtime/src/kmp_runtime.cpp Thu Jun  1 13:10:45 2017
@@ -2043,13 +2043,8 @@ int __kmp_fork_call(ident_t *loc, int gt
     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),