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

[Andrey Churbanov via Openmp-commits]

Author: achurbanov
Date: Tue Mar 28 08:35:42 2017
New Revision: 298915

URL: http://llvm.org/viewvc/llvm-project?rev=298915&view=rev
Log:
Fix for bug https://llvm.org/bugs/show_bug.cgi?id=30889
Condition adjusted for Debug assertion.

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

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=298915&r1=298914&r2=298915&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_runtime.cpp (original)
+++ openmp/trunk/runtime/src/kmp_runtime.cpp Tue Mar 28 08:35:42 2017
@@ -2284,7 +2284,7 @@ __kmp_join_call(ident_t *loc, int gtid
 #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) );