Skip to content

Commit 2c70828

Browse files
sunny868RealFYang
authored andcommitted
8305236: Some LoadLoad barriers in the interpreter are unnecessary after JDK-8220051
Reviewed-by: dholmes, fyang, aph
1 parent ffb2494 commit 2c70828

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

src/hotspot/cpu/aarch64/templateTable_aarch64.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,12 +1747,6 @@ void TemplateTable::float_cmp(bool is_float, int unordered_result)
17471747

17481748
void TemplateTable::branch(bool is_jsr, bool is_wide)
17491749
{
1750-
// We might be moving to a safepoint. The thread which calls
1751-
// Interpreter::notice_safepoints() will effectively flush its cache
1752-
// when it makes a system call, but we need to do something to
1753-
// ensure that we see the changed dispatch table.
1754-
__ membar(MacroAssembler::LoadLoad);
1755-
17561750
__ profile_taken_branch(r0, r1);
17571751
const ByteSize be_offset = MethodCounters::backedge_counter_offset() +
17581752
InvocationCounter::counter_offset();
@@ -1968,12 +1962,6 @@ void TemplateTable::if_acmp(Condition cc)
19681962

19691963
void TemplateTable::ret() {
19701964
transition(vtos, vtos);
1971-
// We might be moving to a safepoint. The thread which calls
1972-
// Interpreter::notice_safepoints() will effectively flush its cache
1973-
// when it makes a system call, but we need to do something to
1974-
// ensure that we see the changed dispatch table.
1975-
__ membar(MacroAssembler::LoadLoad);
1976-
19771965
locals_index(r1);
19781966
__ ldr(r1, aaddress(r1)); // get return bci, compute return bcp
19791967
__ profile_ret(r1, r2);

src/hotspot/cpu/riscv/templateTable_riscv.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,12 +1600,6 @@ void TemplateTable::float_cmp(bool is_float, int unordered_result) {
16001600
}
16011601

16021602
void TemplateTable::branch(bool is_jsr, bool is_wide) {
1603-
// We might be moving to a safepoint. The thread which calls
1604-
// Interpreter::notice_safepoints() will effectively flush its cache
1605-
// when it makes a system call, but we need to do something to
1606-
// ensure that we see the changed dispatch table.
1607-
__ membar(MacroAssembler::LoadLoad);
1608-
16091603
__ profile_taken_branch(x10, x11);
16101604
const ByteSize be_offset = MethodCounters::backedge_counter_offset() +
16111605
InvocationCounter::counter_offset();
@@ -1854,12 +1848,6 @@ void TemplateTable::if_acmp(Condition cc) {
18541848

18551849
void TemplateTable::ret() {
18561850
transition(vtos, vtos);
1857-
// We might be moving to a safepoint. The thread which calls
1858-
// Interpreter::notice_safepoints() will effectively flush its cache
1859-
// when it makes a system call, but we need to do something to
1860-
// ensure that we see the changed dispatch table.
1861-
__ membar(MacroAssembler::LoadLoad);
1862-
18631851
locals_index(x11);
18641852
__ ld(x11, aaddress(x11, t1, _masm)); // get return bci, compute return bcp
18651853
__ profile_ret(x11, x12);

0 commit comments

Comments
 (0)