commit 626a792c1f862d3ba4aa16ab27f4be5f80591370
author Andrey Churbanov <Andrey.Churbanov@intel.com> Tue Mar 28 13:35:42 2017 +0000
committer Copybara-Service <copybara-worker@google.com> Mon Aug 31 20:34:20 2020 -0700
tree e810bbd0286c8aa4ea80046242c7d05f7208487c
parent 41fb5b0ed848c114ebfbe33e1ed89aa7877ec6c7

Fix for bug https://llvm.org/bugs/show_bug.cgi?id=30889
Condition adjusted for Debug assertion.

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

llvm-svn: 298915
GitOrigin-RevId: cece72aa04030e88eebe5ef6a0f25760bb0747e4

runtime/src/kmp_runtime.cpp

diff --git a/runtime/src/kmp_runtime.cpp b/runtime/src/kmp_runtime.cpp
index 2210239..e92c9b1 100644
--- a/runtime/src/kmp_runtime.cpp
+++ b/runtime/src/kmp_runtime.cpp
@@ -2284,7 +2284,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) );