Skip to content

Commit 988a531

Browse files
shipilevshipilev
committed
8340181: Shenandoah: Cleanup ShenandoahRuntime stubs
Reviewed-by: adinn, phh, wkemper
1 parent 822a773 commit 988a531

File tree

9 files changed

+60
-64
lines changed

9 files changed

+60
-64
lines changed

‎src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
6767

6868
__ push(saved_regs, sp);
6969
if (UseCompressedOops) {
70-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop_entry), src, dst, count);
70+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop), src, dst, count);
7171
} else {
72-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop_entry), src, dst, count);
72+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop), src, dst, count);
7373
}
7474
__ pop(saved_regs, sp);
7575
__ bind(done);
@@ -164,9 +164,9 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
164164

165165
if (expand_call) {
166166
assert(pre_val != c_rarg1, "smashed arg");
167-
__ super_call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
167+
__ super_call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
168168
} else {
169-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
169+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
170170
}
171171

172172
__ pop(saved, sp);
@@ -698,7 +698,7 @@ void ShenandoahBarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAss
698698
__ bind(runtime);
699699
__ push_call_clobbered_registers();
700700
__ load_parameter(0, pre_val);
701-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
701+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
702702
__ pop_call_clobbered_registers();
703703
__ bind(done);
704704

‎src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler *masm, Dec
144144
// Invoke runtime.
145145
address jrt_address = nullptr;
146146
if (UseCompressedOops) {
147-
jrt_address = CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop_entry);
147+
jrt_address = CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop);
148148
} else {
149-
jrt_address = CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop_entry);
149+
jrt_address = CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop);
150150
}
151151
assert(jrt_address != nullptr, "jrt routine cannot be found");
152152

@@ -302,7 +302,7 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier_impl(MacroAssembler *masm
302302
}
303303

304304
// Invoke runtime.
305-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, R16_thread);
305+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, R16_thread);
306306

307307
// Restore to-be-preserved registers.
308308
if (!preserve_gp_registers && preloaded_mode && pre_val->is_volatile()) {
@@ -906,7 +906,7 @@ void ShenandoahBarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAss
906906
__ push_frame_reg_args(nbytes_save, R11_tmp1);
907907

908908
// Invoke runtime.
909-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), R0_pre_val, R16_thread);
909+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), R0_pre_val, R16_thread);
910910

911911
// Restore to-be-preserved registers.
912912
__ pop_frame();

‎src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
7070

7171
__ push_reg(saved_regs, sp);
7272
if (UseCompressedOops) {
73-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop_entry),
73+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop),
7474
src, dst, count);
7575
} else {
76-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop_entry), src, dst, count);
76+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop), src, dst, count);
7777
}
7878
__ pop_reg(saved_regs, sp);
7979
__ bind(done);
@@ -165,9 +165,9 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
165165
// expand_call should be passed true.
166166
if (expand_call) {
167167
assert(pre_val != c_rarg1, "smashed arg");
168-
__ super_call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
168+
__ super_call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
169169
} else {
170-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
170+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
171171
}
172172

173173
__ pop_reg(saved, sp);
@@ -645,7 +645,7 @@ void ShenandoahBarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAss
645645
__ bind(runtime);
646646
__ push_call_clobbered_registers();
647647
__ load_parameter(0, pre_val);
648-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
648+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
649649
__ pop_call_clobbered_registers();
650650
__ bind(done);
651651

‎src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
163163
assert(dst == rsi, "expected");
164164
assert(count == rdx, "expected");
165165
if (UseCompressedOops) {
166-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop_entry),
166+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop),
167167
src, dst, count);
168168
} else
169169
#endif
170170
{
171-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop_entry),
171+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop),
172172
src, dst, count);
173173
}
174174

@@ -296,9 +296,9 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
296296
__ push(thread);
297297
__ push(pre_val);
298298
#endif
299-
__ MacroAssembler::call_VM_leaf_base(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), 2);
299+
__ MacroAssembler::call_VM_leaf_base(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), 2);
300300
} else {
301-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), LP64_ONLY(c_rarg0) NOT_LP64(pre_val), thread);
301+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), LP64_ONLY(c_rarg0) NOT_LP64(pre_val), thread);
302302
}
303303

304304
NOT_LP64( __ pop(thread); )
@@ -925,7 +925,7 @@ void ShenandoahBarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAss
925925

926926
// load the pre-value
927927
__ load_parameter(0, rcx);
928-
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), rcx, thread);
928+
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), rcx, thread);
929929

930930
__ restore_live_registers(true);
931931

‎src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,9 @@ void ShenandoahBarrierSetC2::satb_write_barrier_pre(GraphKit* kit,
249249
} __ else_(); {
250250

251251
// logging buffer is full, call the runtime
252-
const TypeFunc *tf = ShenandoahBarrierSetC2::write_ref_field_pre_entry_Type();
253-
__ make_leaf_call(tf, CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), "shenandoah_wb_pre", pre_val, tls);
252+
const TypeFunc *tf = ShenandoahBarrierSetC2::write_ref_field_pre_Type();
253+
__ make_leaf_call(tf, CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), "shenandoah_wb_pre",
254+
pre_val, tls);
254255
} __ end_if(); // (!index)
255256
} __ end_if(); // (pre_val != nullptr)
256257
} __ end_if(); // (!marking)
@@ -268,12 +269,12 @@ void ShenandoahBarrierSetC2::satb_write_barrier_pre(GraphKit* kit,
268269

269270
bool ShenandoahBarrierSetC2::is_shenandoah_wb_pre_call(Node* call) {
270271
return call->is_CallLeaf() &&
271-
call->as_CallLeaf()->entry_point() == CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry);
272+
call->as_CallLeaf()->entry_point() == CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre);
272273
}
273274

274275
bool ShenandoahBarrierSetC2::is_shenandoah_clone_call(Node* call) {
275276
return call->is_CallLeaf() &&
276-
call->as_CallLeaf()->entry_point() == CAST_FROM_FN_PTR(address, ShenandoahRuntime::shenandoah_clone_barrier);
277+
call->as_CallLeaf()->entry_point() == CAST_FROM_FN_PTR(address, ShenandoahRuntime::clone_barrier);
277278
}
278279

279280
bool ShenandoahBarrierSetC2::is_shenandoah_lrb_call(Node* call) {
@@ -433,7 +434,7 @@ void ShenandoahBarrierSetC2::insert_pre_barrier(GraphKit* kit, Node* base_oop, N
433434

434435
#undef __
435436

436-
const TypeFunc* ShenandoahBarrierSetC2::write_ref_field_pre_entry_Type() {
437+
const TypeFunc* ShenandoahBarrierSetC2::write_ref_field_pre_Type() {
437438
const Type **fields = TypeTuple::fields(2);
438439
fields[TypeFunc::Parms+0] = TypeInstPtr::NOTNULL; // original field value
439440
fields[TypeFunc::Parms+1] = TypeRawPtr::NOTNULL; // thread
@@ -446,7 +447,7 @@ const TypeFunc* ShenandoahBarrierSetC2::write_ref_field_pre_entry_Type() {
446447
return TypeFunc::make(domain, range);
447448
}
448449

449-
const TypeFunc* ShenandoahBarrierSetC2::shenandoah_clone_barrier_Type() {
450+
const TypeFunc* ShenandoahBarrierSetC2::clone_barrier_Type() {
450451
const Type **fields = TypeTuple::fields(1);
451452
fields[TypeFunc::Parms+0] = TypeOopPtr::NOTNULL; // src oop
452453
const TypeTuple *domain = TypeTuple::make(TypeFunc::Parms+1, fields);
@@ -458,7 +459,7 @@ const TypeFunc* ShenandoahBarrierSetC2::shenandoah_clone_barrier_Type() {
458459
return TypeFunc::make(domain, range);
459460
}
460461

461-
const TypeFunc* ShenandoahBarrierSetC2::shenandoah_load_reference_barrier_Type() {
462+
const TypeFunc* ShenandoahBarrierSetC2::load_reference_barrier_Type() {
462463
const Type **fields = TypeTuple::fields(2);
463464
fields[TypeFunc::Parms+0] = TypeOopPtr::BOTTOM; // original field value
464465
fields[TypeFunc::Parms+1] = TypeRawPtr::BOTTOM; // original load address
@@ -797,11 +798,11 @@ void ShenandoahBarrierSetC2::clone_at_expansion(PhaseMacroExpand* phase, ArrayCo
797798

798799
// Heap is unstable, call into clone barrier stub
799800
Node* call = phase->make_leaf_call(unstable_ctrl, mem,
800-
ShenandoahBarrierSetC2::shenandoah_clone_barrier_Type(),
801-
CAST_FROM_FN_PTR(address, ShenandoahRuntime::shenandoah_clone_barrier),
802-
"shenandoah_clone",
803-
TypeRawPtr::BOTTOM,
804-
src_base);
801+
ShenandoahBarrierSetC2::clone_barrier_Type(),
802+
CAST_FROM_FN_PTR(address, ShenandoahRuntime::clone_barrier),
803+
"shenandoah_clone",
804+
TypeRawPtr::BOTTOM,
805+
src_base);
805806
call = phase->transform_later(call);
806807

807808
ctrl = phase->transform_later(new ProjNode(call, TypeFunc::Control));
@@ -976,7 +977,7 @@ void ShenandoahBarrierSetC2::verify_gc_barriers(Compile* compile, CompilePhase p
976977

977978
Node* ShenandoahBarrierSetC2::ideal_node(PhaseGVN* phase, Node* n, bool can_reshape) const {
978979
if (is_shenandoah_wb_pre_call(n)) {
979-
uint cnt = ShenandoahBarrierSetC2::write_ref_field_pre_entry_Type()->domain()->cnt();
980+
uint cnt = ShenandoahBarrierSetC2::write_ref_field_pre_Type()->domain()->cnt();
980981
if (n->req() > cnt) {
981982
Node* addp = n->in(cnt);
982983
if (has_only_shenandoah_wb_pre_uses(addp)) {
@@ -1062,7 +1063,7 @@ bool ShenandoahBarrierSetC2::final_graph_reshaping(Compile* compile, Node* n, ui
10621063
assert (n->is_Call(), "");
10631064
CallNode *call = n->as_Call();
10641065
if (ShenandoahBarrierSetC2::is_shenandoah_wb_pre_call(call)) {
1065-
uint cnt = ShenandoahBarrierSetC2::write_ref_field_pre_entry_Type()->domain()->cnt();
1066+
uint cnt = ShenandoahBarrierSetC2::write_ref_field_pre_Type()->domain()->cnt();
10661067
if (call->req() > cnt) {
10671068
assert(call->req() == cnt + 1, "only one extra input");
10681069
Node *addp = call->in(cnt);

‎src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ class ShenandoahBarrierSetC2 : public BarrierSetC2 {
9393

9494
ShenandoahBarrierSetC2State* state() const;
9595

96-
static const TypeFunc* write_ref_field_pre_entry_Type();
97-
static const TypeFunc* shenandoah_clone_barrier_Type();
98-
static const TypeFunc* shenandoah_load_reference_barrier_Type();
96+
static const TypeFunc* write_ref_field_pre_Type();
97+
static const TypeFunc* clone_barrier_Type();
98+
static const TypeFunc* load_reference_barrier_Type();
9999
virtual bool has_load_barrier_nodes() const { return true; }
100100

101101
// This is the entry-point for the backend to perform accesses through the Access API.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ void ShenandoahBarrierC2Support::call_lrb_stub(Node*& ctrl, Node*& val, Node* lo
995995
name = "load_reference_barrier_phantom";
996996
}
997997
}
998-
Node* call = new CallLeafNode(ShenandoahBarrierSetC2::shenandoah_load_reference_barrier_Type(), calladdr, name, TypeRawPtr::BOTTOM);
998+
Node* call = new CallLeafNode(ShenandoahBarrierSetC2::load_reference_barrier_Type(), calladdr, name, TypeRawPtr::BOTTOM);
999999

10001000
call->init_req(TypeFunc::Control, ctrl);
10011001
call->init_req(TypeFunc::I_O, phase->C->top());

‎src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,19 @@
3131
#include "oops/oop.inline.hpp"
3232
#include "utilities/copy.hpp"
3333

34-
void ShenandoahRuntime::arraycopy_barrier_oop_entry(oop* src, oop* dst, size_t length) {
35-
ShenandoahBarrierSet *bs = ShenandoahBarrierSet::barrier_set();
36-
bs->arraycopy_barrier(src, dst, length);
37-
}
34+
JRT_LEAF(void, ShenandoahRuntime::arraycopy_barrier_oop(oop* src, oop* dst, size_t length))
35+
ShenandoahBarrierSet::barrier_set()->arraycopy_barrier(src, dst, length);
36+
JRT_END
3837

39-
void ShenandoahRuntime::arraycopy_barrier_narrow_oop_entry(narrowOop* src, narrowOop* dst, size_t length) {
40-
ShenandoahBarrierSet *bs = ShenandoahBarrierSet::barrier_set();
41-
bs->arraycopy_barrier(src, dst, length);
42-
}
38+
JRT_LEAF(void, ShenandoahRuntime::arraycopy_barrier_narrow_oop(narrowOop* src, narrowOop* dst, size_t length))
39+
ShenandoahBarrierSet::barrier_set()->arraycopy_barrier(src, dst, length);
40+
JRT_END
4341

44-
// Shenandoah pre write barrier slowpath
45-
JRT_LEAF(void, ShenandoahRuntime::write_ref_field_pre_entry(oopDesc* orig, JavaThread *thread))
42+
JRT_LEAF(void, ShenandoahRuntime::write_ref_field_pre(oopDesc * orig, JavaThread * thread))
4643
assert(thread == JavaThread::current(), "pre-condition");
4744
assert(orig != nullptr, "should be optimized out");
4845
shenandoah_assert_correct(nullptr, orig);
49-
// store the original value that was in the field reference
46+
// Capture the original value that was in the field reference.
5047
assert(ShenandoahThreadLocalData::satb_mark_queue(thread).is_active(), "Shouldn't be here otherwise");
5148
SATBMarkQueue& queue = ShenandoahThreadLocalData::satb_mark_queue(thread);
5249
ShenandoahBarrierSet::satb_mark_queue_set().enqueue_known_active(queue, orig);
@@ -60,26 +57,24 @@ JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_strong_narrow(oopDe
6057
return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator(src, load_addr);
6158
JRT_END
6259

63-
// Shenandoah clone barrier: makes sure that references point to to-space
64-
// in cloned objects.
65-
JRT_LEAF(void, ShenandoahRuntime::shenandoah_clone_barrier(oopDesc* src))
66-
oop s = oop(src);
67-
shenandoah_assert_correct(nullptr, s);
68-
ShenandoahBarrierSet::barrier_set()->clone_barrier(s);
69-
JRT_END
70-
71-
JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_weak(oopDesc * src, oop* load_addr))
60+
JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_weak(oopDesc* src, oop* load_addr))
7261
return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier<oop>(ON_WEAK_OOP_REF, oop(src), load_addr);
7362
JRT_END
7463

75-
JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_weak_narrow(oopDesc * src, narrowOop* load_addr))
64+
JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_weak_narrow(oopDesc* src, narrowOop* load_addr))
7665
return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier<narrowOop>(ON_WEAK_OOP_REF, oop(src), load_addr);
7766
JRT_END
7867

79-
JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_phantom(oopDesc * src, oop* load_addr))
68+
JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_phantom(oopDesc* src, oop* load_addr))
8069
return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier<oop>(ON_PHANTOM_OOP_REF, oop(src), load_addr);
8170
JRT_END
8271

83-
JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_phantom_narrow(oopDesc * src, narrowOop* load_addr))
72+
JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_phantom_narrow(oopDesc* src, narrowOop* load_addr))
8473
return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier<narrowOop>(ON_PHANTOM_OOP_REF, oop(src), load_addr);
8574
JRT_END
75+
76+
JRT_LEAF(void, ShenandoahRuntime::clone_barrier(oopDesc* src))
77+
oop s = oop(src);
78+
shenandoah_assert_correct(nullptr, s);
79+
ShenandoahBarrierSet::barrier_set()->clone_barrier(s);
80+
JRT_END

‎src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ class oopDesc;
3333

3434
class ShenandoahRuntime : public AllStatic {
3535
public:
36-
static void arraycopy_barrier_oop_entry(oop* src, oop* dst, size_t length);
37-
static void arraycopy_barrier_narrow_oop_entry(narrowOop* src, narrowOop* dst, size_t length);
36+
static void arraycopy_barrier_oop(oop* src, oop* dst, size_t length);
37+
static void arraycopy_barrier_narrow_oop(narrowOop* src, narrowOop* dst, size_t length);
3838

39-
static void write_ref_field_pre_entry(oopDesc* orig, JavaThread* thread);
39+
static void write_ref_field_pre(oopDesc* orig, JavaThread* thread);
4040

4141
static oopDesc* load_reference_barrier_strong(oopDesc* src, oop* load_addr);
4242
static oopDesc* load_reference_barrier_strong_narrow(oopDesc* src, narrowOop* load_addr);
@@ -47,7 +47,7 @@ class ShenandoahRuntime : public AllStatic {
4747
static oopDesc* load_reference_barrier_phantom(oopDesc* src, oop* load_addr);
4848
static oopDesc* load_reference_barrier_phantom_narrow(oopDesc* src, narrowOop* load_addr);
4949

50-
static void shenandoah_clone_barrier(oopDesc* src);
50+
static void clone_barrier(oopDesc* src);
5151
};
5252

5353
#endif // SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP

0 commit comments

Comments
 (0)