Skip to content

Commit 7fe7cfc

Browse files
committed
8320907: Shenandoah: Remove ShenandoahSelfFixing flag
Backport-of: 43c7f6a673c2fa0b4dbec232e92b621619a98246
1 parent 1b5aeb9 commit 7fe7cfc

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
@@ -1386,11 +1386,9 @@ void ShenandoahBarrierC2Support::pin_and_expand(PhaseIdealLoop* phase) {
13861386
Node* result_mem = nullptr;
13871387

13881388
Node* addr;
1389-
if (ShenandoahSelfFixing) {
1389+
{
13901390
VectorSet visited;
13911391
addr = get_load_addr(phase, visited, lrb);
1392-
} else {
1393-
addr = phase->igvn().zerocon(T_OBJECT);
13941392
}
13951393
if (addr->Opcode() == Op_AddP) {
13961394
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
@@ -361,9 +361,6 @@
361361
product(bool, ShenandoahLoopOptsAfterExpansion, true, DIAGNOSTIC, \
362362
"Attempt more loop opts after barrier expansion.") \
363363
\
364-
product(bool, ShenandoahSelfFixing, true, DIAGNOSTIC, \
365-
"Fix references with load reference barrier. Disabling this " \
366-
"might degrade performance.")
367364

368365
// end of GC_SHENANDOAH_FLAGS
369366

0 commit comments

Comments
 (0)