8238574: Shenandoah: Assertion failure due to missing null check

zhengyu123 · zhengyu123 · commit 87031d472815 · 2020-02-06T13:08:14.000-05:00
Reviewed-by: shade
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -120,7 +120,9 @@ inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_loa
   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;
 }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,9 @@ inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_loa`
`120`	`120`	`if (value != NULL) {`
`121`	`121`	`ShenandoahBarrierSet *const bs = ShenandoahBarrierSet::barrier_set();`
`122`	`122`	`value = bs->load_reference_barrier_native(value, addr);`
`123`		`- bs->keep_alive_if_weak<decorators>(value);`
	`123`	`+ if (value != NULL) {`
	`124`	`+ bs->keep_alive_if_weak<decorators>(value);`
	`125`	`+ }`
`124`	`126`	`}`
`125`	`127`	`return value;`
`126`	`128`	`}`