src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp

*** 145,155 ****
        oop resolved = ShenandoahBarrierSet::resolve_forwarded_not_null(obj);
        if (resolved == obj) {
          resolved = _heap->evacuate_object(obj, _thread);
        }
  
!       Atomic::cmpxchg(resolved, p, obj);
      }
    }
  }
  
  void ShenandoahEvacUpdateOopStorageRootsClosure::do_oop(narrowOop* p) {
--- 145,155 ----
        oop resolved = ShenandoahBarrierSet::resolve_forwarded_not_null(obj);
        if (resolved == obj) {
          resolved = _heap->evacuate_object(obj, _thread);
        }
  
!       Atomic::cmpxchg(p, obj, resolved);
      }
    }
  }
  
  void ShenandoahEvacUpdateOopStorageRootsClosure::do_oop(narrowOop* p) {