changeset 60818:e466454d7cfc

8242316: Shenandoah: Turn NULL-check into assert in SATB slow-path entry Reviewed-by: zgu, shade
author rkennke
date Wed, 08 Apr 2020 11:26:49 +0200
parents ade2a3a85d97
children fcbb67d1ebeb
files src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp	Wed Apr 08 10:43:16 2020 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp	Wed Apr 08 11:26:49 2020 +0200
@@ -43,10 +43,7 @@
 
 // Shenandoah pre write barrier slowpath
 JRT_LEAF(void, ShenandoahRuntime::write_ref_field_pre_entry(oopDesc* orig, JavaThread *thread))
-  if (orig == NULL) {
-    assert(false, "should be optimized out");
-    return;
-  }
+  assert(orig != NULL, "should be optimized out");
   shenandoah_assert_correct(NULL, orig);
   // store the original value that was in the field reference
   assert(ShenandoahThreadLocalData::satb_mark_queue(thread).is_active(), "Shouldn't be here otherwise");