Skip to content

Commit 54f7b6c

Browse files
committed
8301497: Replace NULL with nullptr in cpu/s390
Reviewed-by: amitkumar, coleenp
1 parent 8ecb5df commit 54f7b6c

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

+452
-452
lines changed

src/hotspot/cpu/s390/abstractInterpreter_s390.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2016 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -121,17 +121,17 @@ int AbstractInterpreter::size_activation(int max_stack,
121121
//
122122
// Parameters:
123123
//
124-
// interpreter_frame != NULL:
124+
// interpreter_frame isn't null:
125125
// set up the method, locals, and monitors.
126-
// The frame interpreter_frame, if not NULL, is guaranteed to be the
126+
// The frame interpreter_frame, if not null, is guaranteed to be the
127127
// right size, as determined by a previous call to this method.
128128
// It is also guaranteed to be walkable even though it is in a skeletal state
129129
//
130-
// is_top_frame == true:
130+
// is_top_frame is true:
131131
// We're processing the *oldest* interpreter frame!
132132
//
133133
// pop_frame_extra_args:
134-
// If this is != 0 we are returning to a deoptimized frame by popping
134+
// If this isn't 0 we are returning to a deoptimized frame by popping
135135
// off the callee frame. We want to re-execute the call that called the
136136
// callee interpreted, but since the return to the interpreter would pop
137137
// the arguments off advance the esp by dummy popframe_extra_args slots.

src/hotspot/cpu/s390/assembler_s390.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class RelAddr {
137137
assert(((uint64_t)target & 0x0001L) == 0, "target of a relative address must be aligned");
138138
assert(((uint64_t)pc & 0x0001L) == 0, "origin of a relative address must be aligned");
139139

140-
if ((target == NULL) || (target == pc)) {
140+
if ((target == nullptr) || (target == pc)) {
141141
return 0; // Yet unknown branch destination.
142142
} else {
143143
guarantee(is_in_range_of_RelAddr(target, pc, shortForm), "target not within reach");
@@ -295,7 +295,7 @@ class AddressLiteral {
295295

296296
protected:
297297
// creation
298-
AddressLiteral() : _address(NULL), _rspec() {}
298+
AddressLiteral() : _address(nullptr), _rspec() {}
299299

300300
public:
301301
AddressLiteral(address addr, RelocationHolder const& rspec)

src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -375,7 +375,7 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {
375375

376376
address entry = __ pc();
377377
NativeGeneralJump::insert_unconditional((address)_pc_start, entry);
378-
address target = NULL;
378+
address target = nullptr;
379379
relocInfo::relocType reloc_type = relocInfo::none;
380380
switch (_id) {
381381
case access_field_id: target = Runtime1::entry_for (Runtime1::access_field_patching_id); break;

0 commit comments

Comments
 (0)