commit 4e18b69e7a0a8168061d393cc0c8b0d70aa358b8
author Jonathan Peyton <jonathan.l.peyton@intel.com> Tue Mar 12 11:36:43 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 12 11:44:42 2024 -0700
tree dee6b602a111afe045fbf7c867acc61afd461d22
parent bcc6d7dc2f6c3e55cb6c90336544baa30ad8983c

[OpenMP] Make sure mask is set to nullptr (#83299)

GitOrigin-RevId: 3303be63fc2ac196568b03f58c146655e19183f6

runtime/src/kmp.h

diff --git a/runtime/src/kmp.h b/runtime/src/kmp.h
index 48d7124..de758d3 100644
--- a/runtime/src/kmp.h
+++ b/runtime/src/kmp.h
@@ -825,7 +825,7 @@
 
 public:
   kmp_affinity_raii_t(const kmp_affin_mask_t *new_mask = nullptr)
-      : restored(false) {
+      : mask(nullptr), restored(false) {
     if (KMP_AFFINITY_CAPABLE()) {
       KMP_CPU_ALLOC(mask);
       KMP_ASSERT(mask != NULL);
@@ -835,7 +835,7 @@
     }
   }
   void restore() {
-    if (!restored && KMP_AFFINITY_CAPABLE()) {
+    if (mask && KMP_AFFINITY_CAPABLE() && !restored) {
       __kmp_set_system_affinity(mask, /*abort_on_error=*/true);
       KMP_CPU_FREE(mask);
     }