commit 1196c88b7ee387d6fb450de1456b3186b6349f3a
author Johannes Doerfert <johannes@jdoerfert.de> Sat Oct 16 14:20:36 2021 -0500
committer Copybara-Service <copybara-worker@google.com> Wed Oct 27 16:20:35 2021 -0700
tree 1609ad00fc78d9f315ce8ce8af726010e997b8ab
parent 287fc87424734d4de0465deaddf65174c4347301

[OpenMP][FIX] Do not dereference a potential nullptr

The first thread state in the new GPU runtime doesn't have a previous
one and we should not dereference the nullptr placeholder.

Reviewed By: tianshilei1992

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

GitOrigin-RevId: dc72960967d7a440d0dfd30bbc70e4131ca5e239

libomptarget/DeviceRTL/src/State.cpp

diff --git a/libomptarget/DeviceRTL/src/State.cpp b/libomptarget/DeviceRTL/src/State.cpp
index b35b9b3..538dc95 100644
--- a/libomptarget/DeviceRTL/src/State.cpp
+++ b/libomptarget/DeviceRTL/src/State.cpp
@@ -263,9 +263,9 @@
     PreviousThreadState = nullptr;
   }
 
-  void init(ThreadStateTy &PreviousTS) {
-    ICVState = PreviousTS.ICVState;
-    PreviousThreadState = &PreviousTS;
+  void init(ThreadStateTy *PreviousTS) {
+    ICVState = PreviousTS ? PreviousTS->ICVState : TeamState.ICVState;
+    PreviousThreadState = PreviousTS;
   }
 };
 
@@ -369,7 +369,7 @@
   unsigned TId = mapping::getThreadIdInBlock();
   ThreadStateTy *NewThreadState =
       static_cast<ThreadStateTy *>(__kmpc_alloc_shared(sizeof(ThreadStateTy)));
-  NewThreadState->init(*ThreadStates[TId]);
+  NewThreadState->init(ThreadStates[TId]);
   ThreadStates[TId] = NewThreadState;
 }