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

jpeyton52 · web-flow · commit 3303be63fc2a · 2024-03-12T11:36:43.000-07:00
diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
@@ -825,7 +825,7 @@ class kmp_affinity_raii_t {
 
 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 @@ class kmp_affinity_raii_t {
     }
   }
   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);
     }

Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,7 @@ class kmp_affinity_raii_t {`
`825`	`825`
`826`	`826`	`public:`
`827`	`827`	`kmp_affinity_raii_t(const kmp_affin_mask_t *new_mask = nullptr)`
`828`		`- : restored(false) {`
	`828`	`+ : mask(nullptr), restored(false) {`
`829`	`829`	`if (KMP_AFFINITY_CAPABLE()) {`
`830`	`830`	`KMP_CPU_ALLOC(mask);`
`831`	`831`	`KMP_ASSERT(mask != NULL);`
`@@ -835,7 +835,7 @@ class kmp_affinity_raii_t {`
`835`	`835`	`}`
`836`	`836`	`}`
`837`	`837`	`void restore() {`
`838`		`- if (!restored && KMP_AFFINITY_CAPABLE()) {`
	`838`	`+ if (mask && KMP_AFFINITY_CAPABLE() && !restored) {`
`839`	`839`	`__kmp_set_system_affinity(mask, /abort_on_error=/true);`
`840`	`840`	`KMP_CPU_FREE(mask);`
`841`	`841`	`}`