Skip to content

Commit 5931948

Browse files
author
David Holmes
committed
8265246: Fix macos-Aarch64 build after JDK-8263709
Reviewed-by: mikael
1 parent 79bff21 commit 5931948

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/hotspot/share/c1/c1_Runtime1.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ void Runtime1::patch_code(JavaThread* current, Runtime1::StubID stub_id) {
12651265

12661266
// Enable WXWrite: the function is called by c1 stub as a runtime function
12671267
// (see another implementation above).
1268-
MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread));
1268+
MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
12691269

12701270
if (TracePatching) {
12711271
tty->print_cr("Deoptimizing because patch is needed");

src/hotspot/share/runtime/deoptimization.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2472,7 +2472,7 @@ Deoptimization::update_method_data_from_interpreter(MethodData* trap_mdo, int tr
24722472

24732473
Deoptimization::UnrollBlock* Deoptimization::uncommon_trap(JavaThread* current, jint trap_request, jint exec_mode) {
24742474
// Enable WXWrite: current function is called from methods compiled by C2 directly
2475-
MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread));
2475+
MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
24762476

24772477
if (TraceDeoptimization) {
24782478
tty->print("Uncommon trap ");

0 commit comments

Comments
 (0)