8253361: Shenandoah: runtime barrier does not honor ShenandoahSelfFixing flag

zhengyu123 · zhengyu123 · commit d35b117956cf · 2020-09-18T20:15:42.000Z
Reviewed-by: rkennke
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -204,7 +204,7 @@ oop ShenandoahBarrierSet::load_reference_barrier_native_impl(oop obj, T* load_ad
   }
 
   oop fwd = load_reference_barrier_not_null(obj);
-  if (load_addr != NULL && fwd != obj) {
+  if (ShenandoahSelfFixing && load_addr != NULL && fwd != obj) {
     // Since we are here and we know the load address, update the reference.
     ShenandoahHeap::cas_oop(fwd, load_addr, obj);
   }

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ oop ShenandoahBarrierSet::load_reference_barrier_native_impl(oop obj, T* load_ad`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`oop fwd = load_reference_barrier_not_null(obj);`
`207`		`- if (load_addr != NULL && fwd != obj) {`
	`207`	`+ if (ShenandoahSelfFixing && load_addr != NULL && fwd != obj) {`
`208`	`208`	`// Since we are here and we know the load address, update the reference.`
`209`	`209`	`ShenandoahHeap::cas_oop(fwd, load_addr, obj);`
`210`	`210`	`}`