Skip to content

Commit 43c7f6a

Browse files
committed
8320907: Shenandoah: Remove ShenandoahSelfFixing flag
Reviewed-by: wkemper, zgu, kdnilsen, rkennke
1 parent da7bcfc commit 43c7f6a

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -1392,11 +1392,9 @@ void ShenandoahBarrierC2Support::pin_and_expand(PhaseIdealLoop* phase) {
13921392
Node* result_mem = nullptr;
13931393

13941394
Node* addr;
1395-
if (ShenandoahSelfFixing) {
1395+
{
13961396
VectorSet visited;
13971397
addr = get_load_addr(phase, visited, lrb);
1398-
} else {
1399-
addr = phase->igvn().zerocon(T_OBJECT);
14001398
}
14011399
if (addr->Opcode() == Op_AddP) {
14021400
Node* orig_base = addr->in(AddPNode::Base);

src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ inline oop ShenandoahBarrierSet::load_reference_barrier(DecoratorSet decorators,
123123
}
124124

125125
oop fwd = load_reference_barrier(obj);
126-
if (ShenandoahSelfFixing && load_addr != nullptr && fwd != obj) {
126+
if (load_addr != nullptr && fwd != obj) {
127127
// Since we are here and we know the load address, update the reference.
128128
ShenandoahHeap::atomic_update_oop(fwd, load_addr, obj);
129129
}

src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,6 @@
366366
product(bool, ShenandoahLoopOptsAfterExpansion, true, DIAGNOSTIC, \
367367
"Attempt more loop opts after barrier expansion.") \
368368
\
369-
product(bool, ShenandoahSelfFixing, true, DIAGNOSTIC, \
370-
"Fix references with load reference barrier. Disabling this " \
371-
"might degrade performance.")
372369

373370
// end of GC_SHENANDOAH_FLAGS
374371

0 commit comments

Comments
 (0)