Skip to content

Commit 948f3b3

Browse files
committed
8301493: Replace NULL with nullptr in cpu/aarch64
Reviewed-by: tschatzl, gziemski, dholmes
1 parent f94f957 commit 948f3b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+441
-441
lines changed

src/hotspot/cpu/aarch64/assembler_aarch64.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void Assembler::emit_data64(jlong data,
102102
RelocationHolder const& rspec,
103103
int format) {
104104

105-
assert(inst_mark() != NULL, "must be inside InstructionMark");
105+
assert(inst_mark() != nullptr, "must be inside InstructionMark");
106106
// Do not use AbstractAssembler::relocate, which is not intended for
107107
// embedded words. Instead, relocate to the enclosing instruction.
108108
code_section()->relocate(inst_mark(), rspec, format);

src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -44,7 +44,7 @@ void C1SafepointPollStub::emit_code(LIR_Assembler* ce) {
4444
__ adr(rscratch1, safepoint_pc);
4545
__ str(rscratch1, Address(rthread, JavaThread::saved_exception_pc_offset()));
4646

47-
assert(SharedRuntime::polling_page_return_handler_blob() != NULL,
47+
assert(SharedRuntime::polling_page_return_handler_blob() != nullptr,
4848
"polling page return stub not created yet");
4949
address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
5050

@@ -334,7 +334,7 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
334334
Address resolve(SharedRuntime::get_resolve_static_call_stub(),
335335
relocInfo::static_call_type);
336336
address call = __ trampoline_call(resolve);
337-
if (call == NULL) {
337+
if (call == nullptr) {
338338
ce->bailout("trampoline stub overflow");
339339
return;
340340
}

0 commit comments

Comments
 (0)