8260048: Shenandoah: ShenandoahMarkingContext asserts are unnecessary

shipilev · shipilev · commit b9582bfc51ac · 2021-03-02T08:17:43.000Z
Backport-of: 5940287b9fa494cf8ddff634a698b0f4891b6f7b
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
@@ -29,13 +29,11 @@
 #include "gc/shenandoah/shenandoahMarkingContext.hpp"
 
 inline bool ShenandoahMarkingContext::mark_strong(oop obj, bool& was_upgraded) {
-  shenandoah_assert_not_forwarded(NULL, obj);
-  return (! allocated_after_mark_start(obj)) && _mark_bit_map.mark_strong(cast_from_oop<HeapWord*>(obj), was_upgraded);
+  return !allocated_after_mark_start(obj) && _mark_bit_map.mark_strong(cast_from_oop<HeapWord*>(obj), was_upgraded);
 }
 
 inline bool ShenandoahMarkingContext::mark_weak(oop obj) {
-  shenandoah_assert_not_forwarded(NULL, obj);
-  return (! allocated_after_mark_start(obj)) && _mark_bit_map.mark_weak(cast_from_oop<HeapWord *>(obj));
+  return !allocated_after_mark_start(obj) && _mark_bit_map.mark_weak(cast_from_oop<HeapWord *>(obj));
 }
 
 inline bool ShenandoahMarkingContext::is_marked(oop obj) const {

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,11 @@`
`29`	`29`	`#include "gc/shenandoah/shenandoahMarkingContext.hpp"`
`30`	`30`
`31`	`31`	`inline bool ShenandoahMarkingContext::mark_strong(oop obj, bool& was_upgraded) {`
`32`		`- shenandoah_assert_not_forwarded(NULL, obj);`
`33`		`- return (! allocated_after_mark_start(obj)) && _mark_bit_map.mark_strong(cast_from_oop<HeapWord*>(obj), was_upgraded);`
	`32`	`+ return !allocated_after_mark_start(obj) && _mark_bit_map.mark_strong(cast_from_oop<HeapWord*>(obj), was_upgraded);`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`inline bool ShenandoahMarkingContext::mark_weak(oop obj) {`
`37`		`- shenandoah_assert_not_forwarded(NULL, obj);`
`38`		`- return (! allocated_after_mark_start(obj)) && _mark_bit_map.mark_weak(cast_from_oop<HeapWord *>(obj));`
	`36`	`+ return !allocated_after_mark_start(obj) && _mark_bit_map.mark_weak(cast_from_oop<HeapWord *>(obj));`
`39`	`37`	`}`
`40`	`38`
`41`	`39`	`inline bool ShenandoahMarkingContext::is_marked(oop obj) const {`