[Openmp-commits] [PATCH] D29638: Fix for bug https://llvm.org/bugs/show_bug.cgi?id=30889

[Andrey Churbanov via Phabricator via Openmp-commits]

AndreyChurbanov created this revision.

Assertion should not work on exit from OpenMP teams construct where task team field can be different in thread structure and in team structure.  Added check that a thread does not exit the teams.


Repository:
  rL LLVM

https://reviews.llvm.org/D29638

Files:
  runtime/src/kmp_runtime.cpp


Index: runtime/src/kmp_runtime.cpp
===================================================================
--- runtime/src/kmp_runtime.cpp
+++ runtime/src/kmp_runtime.cpp
@@ -2282,7 +2282,7 @@
 #endif
 
 #if KMP_DEBUG
-    if ( __kmp_tasking_mode != tskm_immediate_exec ) {
+    if ( __kmp_tasking_mode != tskm_immediate_exec && !exit_teams) {
         KA_TRACE( 20, ( "__kmp_join_call: T#%d, old team = %p old task_team = %p, th_task_team = %p\n",
                          __kmp_gtid_from_thread( master_th ), team,
                          team->t.t_task_team[master_th->th.th_task_state], master_th->th.th_task_team) );


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29638.87420.patch
Type: text/x-patch
Size: 621 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20170207/9bc196b5/attachment.bin>