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

rev 57948 : 8238574: Shenandoah: Assertion failure due to missing null check

@@ -118,12 +118,14 @@
 inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_load_not_in_heap(T* addr) {
   oop value = Raw::oop_load_not_in_heap(addr);
   if (value != NULL) {
     ShenandoahBarrierSet *const bs = ShenandoahBarrierSet::barrier_set();
     value = bs->load_reference_barrier_native(value, addr);
+    if (value != NULL) {
     bs->keep_alive_if_weak<decorators>(value);
   }
+  }
   return value;
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
 template <typename T>