Skip to content

Commit 9c2e5b3

Browse files
offamitkumarTheRealMDoerr
authored andcommitted
8306459: s390x: Replace NULL to nullptr
Reviewed-by: mdoerr
1 parent 6a7dff3 commit 9c2e5b3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/hotspot/cpu/s390/stubGenerator_s390.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3155,7 +3155,7 @@ class StubGenerator: public StubCodeGenerator {
31553155

31563156
// nmethod entry barriers for concurrent class unloading
31573157
BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
3158-
if (bs_nm != NULL) {
3158+
if (bs_nm != nullptr) {
31593159
StubRoutines::zarch::_nmethod_entry_barrier = generate_nmethod_entry_barrier();
31603160
}
31613161

src/hotspot/cpu/s390/templateTable_s390.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2425,7 +2425,7 @@ void TemplateTable::load_invokedynamic_entry(Register method) {
24252425
__ load_resolved_indy_entry(cache, index);
24262426
__ z_lg(method, Address(cache, in_bytes(ResolvedIndyEntry::method_offset())));
24272427

2428-
// The invokedynamic is unresolved iff method is NULL
2428+
// The invokedynamic is unresolved iff method is null
24292429
__ z_clgij(method, (unsigned long)nullptr, Assembler::bcondNotEqual, resolved); // method != 0, jump to resolved
24302430
Bytecodes::Code code = bytecode();
24312431
// Call to the interpreter runtime to resolve invokedynamic

0 commit comments

Comments
 (0)