stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8317257: RISC-V: llvm build broken

Browse Source 
Reviewed-by: fyang
This commit is contained in:
Vladimir Kempik 2023-09-29 05:15:23 +00:00
parent 0259da9283
commit bd7bb67d8f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
View File

@ -1515,7 +1515,7 @@ void LIR_Assembler::emit_lock(LIR_OpLock* op) {
if (LockingMode == LM_MONITOR) { if (LockingMode == LM_MONITOR) {
if (op->info() != nullptr) { if (op->info() != nullptr) {
add_debug_info_for_null_check_here(op->info()); add_debug_info_for_null_check_here(op->info());
__ null_check(obj); __ null_check(obj, -1);
} }
__ j(*op->stub()->entry()); __ j(*op->stub()->entry());
} else if (op->code() == lir_lock) { } else if (op->code() == lir_lock) {

2
src/hotspot/os/linux/os_linux.cpp
View File

@ -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 #define MAP_FIXED_NOREPLACE MAP_FIXED_NOREPLACE_value
#else #else
// Sanity-check our assumed default value if we build with a new enough libc. // 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 #endif
int os::Linux::commit_memory_impl(char* addr, size_t size, int os::Linux::commit_memory_impl(char* addr, size_t size,