[Openmp-commits] [PATCH] D31421: Re-enable assertion after the problem that caused it to be hit had been fixed.

[Phabricator via Phabricator via Openmp-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL304443: Re-enable assertion after the problem that caused it to be hit had been fixed (authored by achurbanov).

Changed prior to commit:
  https://reviews.llvm.org/D31421?vs=93237&id=101054#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D31421

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


Index: openmp/trunk/runtime/src/kmp_runtime.cpp
===================================================================
--- openmp/trunk/runtime/src/kmp_runtime.cpp
+++ openmp/trunk/runtime/src/kmp_runtime.cpp
@@ -2043,13 +2043,8 @@
     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),


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31421.101054.patch
Type: text/x-patch
Size: 948 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20170601/5c222164/attachment.bin>