8254672: ZGC: ZParallelOopsDo/ZSerialWeakOopsDo should use atomic loa…

…d/store Reviewed-by: stefank
openjdk · Oct 13, 2020 · 02d9c29 · 02d9c29 · bridgekeeper · Oct 13, 2020
1 parent 65393a0
commit 02d9c29
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/hotspot/share/gc/z/zRootsIterator.cpp b/src/hotspot/share/gc/z/zRootsIterator.cpp
@@ -68,10 +68,10 @@ ZParallelOopsDo<T, F>::ZParallelOopsDo(T* iter) :
 
 template <typename T, void (T::*F)(ZRootsIteratorClosure*)>
 void ZParallelOopsDo<T, F>::oops_do(ZRootsIteratorClosure* cl) {
-  if (!_completed) {
+  if (!Atomic::load(&_completed)) {
     (_iter->*F)(cl);
-    if (!_completed) {
-      _completed = true;
+    if (!Atomic::load(&_completed)) {
+      Atomic::store(&_completed, true);
     }
   }
 }
@@ -83,7 +83,7 @@ ZSerialWeakOopsDo<T, F>::ZSerialWeakOopsDo(T* iter) :
 
 template <typename T, void (T::*F)(BoolObjectClosure*, ZRootsIteratorClosure*)>
 void ZSerialWeakOopsDo<T, F>::weak_oops_do(BoolObjectClosure* is_alive, ZRootsIteratorClosure* cl) {
-  if (!_claimed && Atomic::cmpxchg(&_claimed, false, true) == false) {
+  if (!Atomic::load(&_claimed) && Atomic::cmpxchg(&_claimed, false, true) == false) {
     (_iter->*F)(is_alive, cl);
   }
 }