[Openmp-commits] [openmp] r316452 - Disable threadprivate data cleanup if runtime is terminating

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Tue Oct 24 09:10:09 2017
New Revision: 316452

URL: http://llvm.org/viewvc/llvm-project?rev=316452&view=rev
Log:
Disable threadprivate data cleanup if runtime is terminating

The problem is due to the runtime's threadprivate cleanup code which tries to
access data that was already destroyed by one of the root threads.
__kmp_init_gtid is used as a checker here since it is set to false before actual
resource cleanup is done in __kmp_cleanup().

Patch by Hansang Bae

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

Modified: openmp/trunk/runtime/src/kmp_threadprivate.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_threadprivate.cpp?rev=316452&r1=316451&r2=316452&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_threadprivate.cpp (original)
+++ openmp/trunk/runtime/src/kmp_threadprivate.cpp Tue Oct 24 09:10:09 2017
@@ -226,6 +226,13 @@ void __kmp_common_destroy_gtid(int gtid)
   struct private_common *tn;
   struct shared_common *d_tn;
 
+  if (!TCR_4(__kmp_init_gtid)) {
+    // This is possible when one of multiple roots initiates early library
+    // termination in a sequential region while other teams are active, and its
+    // child threads are about to end.
+    return;
+  }
+
   KC_TRACE(10, ("__kmp_common_destroy_gtid: T#%d called\n", gtid));
   if ((__kmp_foreign_tp) ? (!KMP_INITIAL_GTID(gtid)) : (!KMP_UBER_GTID(gtid))) {