Skip to content

Commit bd7bb67

Browse files
author
Vladimir Kempik
committed
8317257: RISC-V: llvm build broken
Reviewed-by: fyang
1 parent 0259da9 commit bd7bb67

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1515,7 +1515,7 @@ void LIR_Assembler::emit_lock(LIR_OpLock* op) {
15151515
if (LockingMode == LM_MONITOR) {
15161516
if (op->info() != nullptr) {
15171517
add_debug_info_for_null_check_here(op->info());
1518-
__ null_check(obj);
1518+
__ null_check(obj, -1);
15191519
}
15201520
__ j(*op->stub()->entry());
15211521
} else if (op->code() == lir_lock) {

src/hotspot/os/linux/os_linux.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2840,7 +2840,7 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,
28402840
#define MAP_FIXED_NOREPLACE MAP_FIXED_NOREPLACE_value
28412841
#else
28422842
// Sanity-check our assumed default value if we build with a new enough libc.
2843-
static_assert(MAP_FIXED_NOREPLACE == MAP_FIXED_NOREPLACE_value);
2843+
static_assert(MAP_FIXED_NOREPLACE == MAP_FIXED_NOREPLACE_value, "MAP_FIXED_NOREPLACE != MAP_FIXED_NOREPLACE_value");
28442844
#endif
28452845

28462846
int os::Linux::commit_memory_impl(char* addr, size_t size,

0 commit comments

Comments
 (0)