Skip to content

Commit

Permalink
8301508: Replace NULL with nullptr in os_cpu/linux_s390
Browse files Browse the repository at this point in the history 
Reviewed-by: kbarrett
  • Loading branch information
@jdksjolen
jdksjolen committed Feb 2, 2023
1 parent c8307e3 commit d097b5e
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
14 changes: 7 additions & 7 deletions src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.cpp
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2022 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
Expand Down Expand Up @@ -37,7 +37,7 @@ frame JavaThread::pd_last_frame() {
// Last_Java_pc is not set if we come here from compiled code.
// Assume spill slot for Z_R14 (return register) contains a suitable pc.
// Should have been filled by method entry code.
if (pc == NULL) {
if (pc == nullptr) {
pc = (address) *(sp + 14);
}

Expand All @@ -60,17 +60,17 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
ucontext_t* uc = (ucontext_t*) ucontext;
address pc = (address)uc->uc_mcontext.psw.addr;

if (pc == NULL) {
if (pc == nullptr) {
// ucontext wasn't useful
return false;
}

frame ret_frame((intptr_t*)uc->uc_mcontext.gregs[15/*Z_SP*/], pc);

if (ret_frame.fp() == NULL) {
if (ret_frame.fp() == nullptr) {
// The found frame does not have a valid frame pointer.
// Bail out because this will create big trouble later on, either
// - when using istate, calculated as (NULL - z_ijava_state_size (= 0x70 (dbg) or 0x68 (rel)) or
// - when using istate, calculated as (nullptr - z_ijava_state_size (= 0x70 (dbg) or 0x68 (rel)) or
// - when using fp() directly in safe_for_sender()
//
// There is no conclusive description (yet) how this could happen, but it does:
Expand All @@ -92,9 +92,9 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
// contents of r6: 0xffffffffffffff90
//
// Here is the sequence of what happens:
// - ret_frame is constructed with _fp == NULL (for whatever reason)
// - ret_frame is constructed with _fp == nullptr (for whatever reason)
// - ijava_state_unchecked() calculates it's result as
// istate = fp() - z_ijava_state_size() = NULL - 0x68 DEBUG_ONLY(-8)
// istate = fp() - z_ijava_state_size() = nullptr - 0x68 DEBUG_ONLY(-8)
// - istate->method dereferences memory at offset 8 from istate
return false;
}
Expand Down
46 changes: 23 additions & 23 deletions src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
Expand Down Expand Up @@ -115,7 +115,7 @@ intptr_t* os::Linux::ucontext_get_sp(const ucontext_t * uc) {
}

intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) {
return NULL;
return nullptr;
}

address os::fetch_frame_from_context(const void* ucVoid,
Expand All @@ -124,14 +124,14 @@ address os::fetch_frame_from_context(const void* ucVoid,
address epc;
const ucontext_t* uc = (const ucontext_t*)ucVoid;

if (uc != NULL) {
if (uc != nullptr) {
epc = os::Posix::ucontext_get_pc(uc);
if (ret_sp) { *ret_sp = os::Linux::ucontext_get_sp(uc); }
if (ret_fp) { *ret_fp = os::Linux::ucontext_get_fp(uc); }
} else {
epc = NULL;
if (ret_sp) { *ret_sp = (intptr_t *)NULL; }
if (ret_fp) { *ret_fp = (intptr_t *)NULL; }
epc = nullptr;
if (ret_sp) { *ret_sp = (intptr_t *)nullptr; }
if (ret_fp) { *ret_fp = (intptr_t *)nullptr; }
}

return epc;
Expand Down Expand Up @@ -160,7 +160,7 @@ frame os::get_sender_for_C_frame(frame* fr) {
// If its not one of our frames, the return pc is saved at gpr14
// stack slot. The call_stub stores the return_pc to the stack slot
// of gpr10.
if ((Interpreter::code() != NULL && Interpreter::contains(fr->pc())) ||
if ((Interpreter::code() != nullptr && Interpreter::contains(fr->pc())) ||
(CodeCache::contains(fr->pc()) && !StubRoutines::contains(fr->pc()))) {
return frame(fr->sender_sp(), fr->sender_pc());
} else {
Expand All @@ -181,7 +181,7 @@ frame os::current_frame() {
// Expected to return the stack pointer of this method.
// But if inlined, returns the stack pointer of our caller!
intptr_t* csp = (intptr_t*) *((intptr_t*) os::current_stack_pointer());
assert (csp != NULL, "sp should not be NULL");
assert (csp != nullptr, "sp should not be null");
// Pass a dummy pc. This way we don't have to load it from the
// stack, since we don't know in which slot we can find it.
frame topframe(csp, (address)0x8);
Expand All @@ -190,9 +190,9 @@ frame os::current_frame() {
return frame();
} else {
frame senderFrame = os::get_sender_for_C_frame(&topframe);
assert(senderFrame.pc() != NULL, "Sender pc should not be NULL");
assert(senderFrame.pc() != nullptr, "Sender pc should not be null");
// Return sender of sender of current topframe which hopefully
// both have pc != NULL.
// both have pc != nullptr.
#ifdef _NMT_NOINLINE_ // Is set in slowdebug builds.
// Current_stack_pointer is not inlined, we must pop one more frame.
frame tmp = os::get_sender_for_C_frame(&topframe);
Expand All @@ -207,12 +207,12 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
ucontext_t* uc, JavaThread* thread) {

// Decide if this trap can be handled by a stub.
address stub = NULL;
address pc = NULL; // Pc as retrieved from PSW. Usually points past failing instruction.
address trap_pc = NULL; // Pc of the instruction causing the trap.
address stub = nullptr;
address pc = nullptr; // Pc as retrieved from PSW. Usually points past failing instruction.
address trap_pc = nullptr; // Pc of the instruction causing the trap.

//%note os_trap_1
if (info != NULL && uc != NULL && thread != NULL) {
if (info != nullptr && uc != nullptr && thread != nullptr) {
pc = os::Posix::ucontext_get_pc(uc);
if (TraceTraps) {
tty->print_cr(" pc at " INTPTR_FORMAT, p2i(pc));
Expand Down Expand Up @@ -266,7 +266,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
// SIGTRAP-based implicit null check in compiled code.
else if ((sig == SIGFPE) &&
TrapBasedNullChecks &&
(trap_pc != NULL) &&
(trap_pc != nullptr) &&
Assembler::is_sigtrap_zero_check(trap_pc)) {
if (TraceTraps) {
tty->print_cr("trap: NULL_CHECK at " INTPTR_FORMAT " (SIGFPE)", p2i(trap_pc));
Expand All @@ -286,7 +286,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
#ifdef COMPILER2
// SIGTRAP-based implicit range check in compiled code.
else if (sig == SIGFPE && TrapBasedRangeChecks &&
(trap_pc != NULL) &&
(trap_pc != nullptr) &&
Assembler::is_sigtrap_range_check(trap_pc)) {
if (TraceTraps) {
tty->print_cr("trap: RANGE_CHECK at " INTPTR_FORMAT " (SIGFPE)", p2i(trap_pc));
Expand All @@ -303,8 +303,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
// BugId 4454115: A read from a MappedByteBuffer can fault here if the
// underlying file has been truncated. Do not crash the VM in such a case.
CodeBlob* cb = CodeCache::find_blob(pc);
CompiledMethod* nm = (cb != NULL) ? cb->as_compiled_method_or_null() : NULL;
if (nm != NULL && nm->has_unsafe_access()) {
CompiledMethod* nm = (cb != nullptr) ? cb->as_compiled_method_or_null() : nullptr;
if (nm != nullptr && nm->has_unsafe_access()) {
// We don't really need a stub here! Just set the pending exception and
// continue at the next instruction after the faulting read. Returning
// garbage from this read is ok.
Expand Down Expand Up @@ -349,9 +349,9 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
}
}

if (stub != NULL) {
if (stub != nullptr) {
// Save all thread context in case we need to restore it.
if (thread != NULL) thread->set_saved_exception_pc(pc);
if (thread != nullptr) thread->set_saved_exception_pc(pc);
os::Posix::ucontext_set_pc(uc, stub);
return true;
}
Expand Down Expand Up @@ -392,7 +392,7 @@ size_t os::Posix::default_stack_size(os::ThreadType thr_type) {
// helper functions for fatal error handler

void os::print_context(outputStream *st, const void *context) {
if (context == NULL) return;
if (context == nullptr) return;

const ucontext_t* uc = (const ucontext_t*)context;

Expand Down Expand Up @@ -437,7 +437,7 @@ void os::print_context(outputStream *st, const void *context) {
}

void os::print_tos_pc(outputStream *st, const void *context) {
if (context == NULL) return;
if (context == nullptr) return;

const ucontext_t* uc = (const ucontext_t*)context;

Expand All @@ -454,7 +454,7 @@ void os::print_tos_pc(outputStream *st, const void *context) {
}

void os::print_register_info(outputStream *st, const void *context) {
if (context == NULL) return;
if (context == nullptr) return;

const ucontext_t *uc = (const ucontext_t*)context;

Expand Down

1 comment on commit d097b5e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.