From bd7bb67d8f2a6a6bda43b6e2443099574151a7dc Mon Sep 17 00:00:00 2001 From: Vladimir Kempik Date: Fri, 29 Sep 2023 05:15:23 +0000 Subject: [PATCH] 8317257: RISC-V: llvm build broken Reviewed-by: fyang --- src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp | 2 +- src/hotspot/os/linux/os_linux.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp index 2fcb76bda63..d0b21fb1f0d 100644 --- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp @@ -1515,7 +1515,7 @@ void LIR_Assembler::emit_lock(LIR_OpLock* op) { if (LockingMode == LM_MONITOR) { if (op->info() != nullptr) { add_debug_info_for_null_check_here(op->info()); - __ null_check(obj); + __ null_check(obj, -1); } __ j(*op->stub()->entry()); } else if (op->code() == lir_lock) { diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp index 3f6acced848..53568d19880 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -2840,7 +2840,7 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec, #define MAP_FIXED_NOREPLACE MAP_FIXED_NOREPLACE_value #else // Sanity-check our assumed default value if we build with a new enough libc. - static_assert(MAP_FIXED_NOREPLACE == MAP_FIXED_NOREPLACE_value); + static_assert(MAP_FIXED_NOREPLACE == MAP_FIXED_NOREPLACE_value, "MAP_FIXED_NOREPLACE != MAP_FIXED_NOREPLACE_value"); #endif int os::Linux::commit_memory_impl(char* addr, size_t size,