Skip to content

Commit efb79dc

Browse files
author
Kim Barrett
committed
8374444: Fix simple -Wzero-as-null-pointer-constant warnings
Reviewed-by: aboldtch
1 parent 05d2f7f commit efb79dc

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

src/hotspot/share/cds/aotMappedHeapWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -124,7 +124,7 @@ CompressedOops::Mode AOTMappedHeapWriter::narrow_oop_mode() {
124124

125125
address AOTMappedHeapWriter::narrow_oop_base() {
126126
if (is_writing_deterministic_heap()) {
127-
return (address)0;
127+
return nullptr;
128128
} else {
129129
return CompressedOops::base();
130130
}

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -1218,7 +1218,7 @@ C2V_VMENTRY_0(jint, installCode0, (JNIEnv *env, jobject,
12181218
return result;
12191219
C2V_END
12201220

1221-
C2V_VMENTRY_0(jobject, getInvalidationReasonDescription, (JNIEnv *env, jobject, jint invalidation_reason))
1221+
C2V_VMENTRY_NULL(jobject, getInvalidationReasonDescription, (JNIEnv *env, jobject, jint invalidation_reason))
12221222
HandleMark hm(THREAD);
12231223
JNIHandleMark jni_hm(thread);
12241224
nmethod::InvalidationReason reason = static_cast<nmethod::InvalidationReason>(invalidation_reason);

src/hotspot/share/opto/vectorization.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2023, Arm Limited. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -132,10 +132,10 @@ VStatus VLoop::check_preconditions_helper() {
132132
tty->print_cr(" Infrastructure for speculative runtime-checks:");
133133
if (_auto_vectorization_parse_predicate_proj != nullptr) {
134134
tty->print_cr(" auto_vectorization_parse_predicate_proj: speculate and trap");
135-
_auto_vectorization_parse_predicate_proj->dump_bfs(5,0,"");
135+
_auto_vectorization_parse_predicate_proj->dump_bfs(5, nullptr, "");
136136
} else if (_multiversioning_fast_proj != nullptr) {
137137
tty->print_cr(" multiversioning_fast_proj: speculate and multiversion");
138-
_multiversioning_fast_proj->dump_bfs(5,0,"");
138+
_multiversioning_fast_proj->dump_bfs(5, nullptr, "");
139139
} else {
140140
tty->print_cr(" Not found.");
141141
}

src/hotspot/share/runtime/continuationFreezeThaw.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -1736,8 +1736,8 @@ static void verify_frame_kind(frame& top, Continuation::preempt_kind preempt_kin
17361736
m = top.interpreter_frame_method();
17371737
assert(!m->is_native() || m->is_synchronized(), "invalid method %s", m->external_name());
17381738
address bcp = top.interpreter_frame_bcp();
1739-
assert(bcp != 0 || m->is_native(), "");
1740-
at_sync_method = m->is_synchronized() && (bcp == 0 || bcp == m->code_base());
1739+
assert(bcp != nullptr || m->is_native(), "");
1740+
at_sync_method = m->is_synchronized() && (bcp == nullptr || bcp == m->code_base());
17411741
// bcp is advanced on monitorenter before making the VM call, adjust for that.
17421742
bool at_sync_bytecode = bcp > m->code_base() && Bytecode(m, bcp - 1).code() == Bytecodes::Code::_monitorenter;
17431743
assert(at_sync_method || at_sync_bytecode, "");

test/hotspot/gtest/nmt/test_regions_tree.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ TEST_VM_F(NMTRegionsTreeTest, ReserveCommitTwice) {
4848
}
4949
{
5050
VMATree::SummaryDiff diff, not_used;
51-
rt.commit_region(0, 50, ncs, not_used);
51+
rt.commit_region(nullptr, 50, ncs, not_used);
5252
rt.reserve_mapping(0, 100, rd, diff);
5353
EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
5454
EXPECT_EQ(-50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
@@ -62,10 +62,10 @@ TEST_VM_F(NMTRegionsTreeTest, ReserveCommitTwice) {
6262

6363
{
6464
VMATree::SummaryDiff diff1, diff2;
65-
rt.commit_region(0, 50, ncs, diff1);
65+
rt.commit_region(nullptr, 50, ncs, diff1);
6666
EXPECT_EQ(0, diff1.tag[NMTUtil::tag_to_index(mtGC)].reserve);
6767
EXPECT_EQ(50, diff1.tag[NMTUtil::tag_to_index(mtGC)].commit);
68-
rt.commit_region(0, 50, ncs, diff2);
68+
rt.commit_region(nullptr, 50, ncs, diff2);
6969
EXPECT_EQ(0, diff2.tag[NMTUtil::tag_to_index(mtTest)].reserve);
7070
EXPECT_EQ(0, diff2.tag[NMTUtil::tag_to_index(mtTest)].commit);
7171
}
@@ -78,7 +78,7 @@ TEST_VM_F(NMTRegionsTreeTest, CommitUncommitRegion) {
7878
rt.reserve_mapping(0, 100, rd, not_used);
7979
{
8080
VMATree::SummaryDiff diff;
81-
rt.commit_region(0, 50, ncs, diff);
81+
rt.commit_region(nullptr, 50, ncs, diff);
8282
EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
8383
EXPECT_EQ(50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
8484
}
@@ -90,7 +90,7 @@ TEST_VM_F(NMTRegionsTreeTest, CommitUncommitRegion) {
9090
}
9191
{
9292
VMATree::SummaryDiff diff;
93-
rt.uncommit_region(0, 50, diff);
93+
rt.uncommit_region(nullptr, 50, diff);
9494
EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
9595
EXPECT_EQ(-50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
9696
}
@@ -153,4 +153,4 @@ TEST_VM_F(NMTRegionsTreeTest, VisitCommittedRegions) {
153153
return true;
154154
});
155155
EXPECT_EQ(count, 4UL);
156-
}
156+
}

0 commit comments

Comments
 (0)