# HG changeset patch
# User zgu
# Date 1580998035 18000
#      Thu Feb 06 09:07:15 2020 -0500
# Node ID e75e4984e16185141ebe933dff5cc82002e4ea23
# Parent  c35eac313084390c7f535a6ef1fcb4903f49d644
8238574: Shenandoah: Assertion failure due to missing null check

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -120,7 +120,9 @@
   if (value != NULL) {
     ShenandoahBarrierSet *const bs = ShenandoahBarrierSet::barrier_set();
     value = bs->load_reference_barrier_native(value, addr);
-    bs->keep_alive_if_weak<decorators>(value);
+    if (value != NULL) {
+      bs->keep_alive_if_weak<decorators>(value);
+    }
   }
   return value;
 }