1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8306459: s390x: Replace NULL to nullptr

Browse Source 
Reviewed-by: mdoerr
This commit is contained in:
Amit Kumar 2023-04-20 12:28:26 +00:00 committed by Martin Doerr
parent 6a7dff30ed
commit 9c2e5b3871
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/cpu/s390/stubGenerator_s390.cpp
View File

@ -3155,7 +3155,7 @@ class StubGenerator: public StubCodeGenerator {
// nmethod entry barriers for concurrent class unloading // nmethod entry barriers for concurrent class unloading
BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod(); BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
if (bs_nm != NULL) { if (bs_nm != nullptr) {
StubRoutines::zarch::_nmethod_entry_barrier = generate_nmethod_entry_barrier(); StubRoutines::zarch::_nmethod_entry_barrier = generate_nmethod_entry_barrier();
} }

2
src/hotspot/cpu/s390/templateTable_s390.cpp
View File

@ -2425,7 +2425,7 @@ void TemplateTable::load_invokedynamic_entry(Register method) {
__ load_resolved_indy_entry(cache, index); __ load_resolved_indy_entry(cache, index);
__ z_lg(method, Address(cache, in_bytes(ResolvedIndyEntry::method_offset()))); __ z_lg(method, Address(cache, in_bytes(ResolvedIndyEntry::method_offset())));
// The invokedynamic is unresolved iff method is NULL // The invokedynamic is unresolved iff method is null
__ z_clgij(method, (unsigned long)nullptr, Assembler::bcondNotEqual, resolved); // method != 0, jump to resolved __ z_clgij(method, (unsigned long)nullptr, Assembler::bcondNotEqual, resolved); // method != 0, jump to resolved
Bytecodes::Code code = bytecode(); Bytecodes::Code code = bytecode();
// Call to the interpreter runtime to resolve invokedynamic // Call to the interpreter runtime to resolve invokedynamic