Skip to content

Commit 713bd36

Browse files
authored
Merge pull request openjdk#24 from zhengxiaolinX/JDK-8286301-loom-riscv-port-22
RISC-V: loom: RVC: Fix two potential alignment issues when RVC's enabled
2 parents 57debca + 4221e55 commit 713bd36

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,9 @@ static void gen_continuation_enter(MacroAssembler* masm,
10971097

10981098
__ bnez(c_rarg2, call_thaw);
10991099

1100+
// Make sure the call is patchable
1101+
__ align(4);
1102+
11001103
address mark = __ pc();
11011104
__ trampoline_call(resolve);
11021105

@@ -1122,6 +1125,9 @@ static void gen_continuation_enter(MacroAssembler* masm,
11221125

11231126
__ bnez(c_rarg2, call_thaw);
11241127

1128+
// Make sure the call is patchable
1129+
__ align(4);
1130+
11251131
address mark = __ pc();
11261132
__ trampoline_call(resolve);
11271133

0 commit comments

Comments
 (0)