archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 18:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8265246: Fix macos-Aarch64 build after JDK-8263709

Browse source 
Reviewed-by: mikael
This commit is contained in:
David Holmes 2021-04-15 03:01:49 +00:00
parent 79bff21b43
commit 593194864a
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/share/c1/c1_Runtime1.cpp
View file

@ -1265,7 +1265,7 @@ void Runtime1::patch_code(JavaThread* current, Runtime1::StubID stub_id) {
// Enable WXWrite: the function is called by c1 stub as a runtime function // Enable WXWrite: the function is called by c1 stub as a runtime function
// (see another implementation above). // (see another implementation above).
MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread)); MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
if (TracePatching) { if (TracePatching) {
tty->print_cr("Deoptimizing because patch is needed"); tty->print_cr("Deoptimizing because patch is needed");

2
src/hotspot/share/runtime/deoptimization.cpp
View file

@ -2472,7 +2472,7 @@ Deoptimization::update_method_data_from_interpreter(MethodData* trap_mdo, int tr
Deoptimization::UnrollBlock* Deoptimization::uncommon_trap(JavaThread* current, jint trap_request, jint exec_mode) { Deoptimization::UnrollBlock* Deoptimization::uncommon_trap(JavaThread* current, jint trap_request, jint exec_mode) {
// Enable WXWrite: current function is called from methods compiled by C2 directly // Enable WXWrite: current function is called from methods compiled by C2 directly
MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread)); MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
if (TraceDeoptimization) { if (TraceDeoptimization) {
tty->print("Uncommon trap "); tty->print("Uncommon trap ");