archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8300241: Replace NULL with nullptr in share/classfile/

Browse source 
Reviewed-by: coleenp, iklam
This commit is contained in:
Johan Sjölen 2023-01-27 16:15:29 +00:00
parent f52d35c84b
commit 49ff52087b
63 changed files with 1834 additions and 1834 deletions
Download patch file Download diff file Expand all files Collapse all files

144
src/hotspot/share/classfile/modules.cpp
View file

@ -54,12 +54,12 @@
#include "utilities/utf8.hpp"
static bool verify_module_name(const char *module_name, int len) {
assert(module_name != NULL, "invariant");
assert(module_name != nullptr, "invariant");
return (len > 0 && len <= Symbol::max_length());
}
static bool verify_package_name(const char* package_name, int len) {
assert(package_name != NULL, "Package name derived from non-null jstring can't be NULL");
assert(package_name != nullptr, "Package name derived from non-null jstring can't be null");
return (len > 0 && len <= Symbol::max_length() &&
ClassFileParser::verify_unqualified_name(package_name, len,
ClassFileParser::LegalClass));
@ -67,7 +67,7 @@ static bool verify_package_name(const char* package_name, int len) {
static char* get_module_name(oop module, int& len, TRAPS) {
oop name_oop = java_lang_Module::name(module);
if (name_oop == NULL) {
if (name_oop == nullptr) {
THROW_MSG_NULL(vmSymbols::java_lang_NullPointerException(), "Null module name");
}
char* module_name = java_lang_String::as_utf8_string(name_oop, len);
@ -79,8 +79,8 @@ static char* get_module_name(oop module, int& len, TRAPS) {
}
static Symbol* as_symbol(jstring str_object) {
if (str_object == NULL) {
return NULL;
if (str_object == nullptr) {
return nullptr;
}
int len;
char* str = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(str_object), len);
@ -112,28 +112,28 @@ static ModuleEntry* get_module_entry(Handle module, TRAPS) {
static PackageEntry* get_locked_package_entry(ModuleEntry* module_entry, const char* package_name, int len) {
assert(Module_lock->owned_by_self(), "should have the Module_lock");
assert(package_name != NULL, "Precondition");
assert(package_name != nullptr, "Precondition");
TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, len);
PackageEntryTable* package_entry_table = module_entry->loader_data()->packages();
assert(package_entry_table != NULL, "Unexpected null package entry table");
assert(package_entry_table != nullptr, "Unexpected null package entry table");
PackageEntry* package_entry = package_entry_table->locked_lookup_only(pkg_symbol);
assert(package_entry == NULL || package_entry->module() == module_entry, "Unexpectedly found a package linked to another module");
assert(package_entry == nullptr || package_entry->module() == module_entry, "Unexpectedly found a package linked to another module");
return package_entry;
}
static PackageEntry* get_package_entry_by_name(Symbol* package, Handle h_loader) {
if (package != NULL) {
if (package != nullptr) {
PackageEntryTable* const package_entry_table =
get_package_entry_table(h_loader);
assert(package_entry_table != NULL, "Unexpected null package entry table");
assert(package_entry_table != nullptr, "Unexpected null package entry table");
return package_entry_table->lookup_only(package);
}
return NULL;
return nullptr;
}
bool Modules::is_package_defined(Symbol* package, Handle h_loader) {
PackageEntry* res = get_package_entry_by_name(package, h_loader);
return res != NULL;
return res != nullptr;
}
// Converts the String oop to an internal package
@ -168,7 +168,7 @@ static void define_javabase_module(Handle module_handle, jstring version, jstrin
for (int x = 0; x < num_packages; x++) {
oop pkg_str = pkgs->obj_at(x);
if (pkg_str == NULL || pkg_str->klass() != vmClasses::String_klass()) {
if (pkg_str == nullptr || pkg_str->klass() != vmClasses::String_klass()) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
err_msg("Bad package name"));
}
@ -185,7 +185,7 @@ static void define_javabase_module(Handle module_handle, jstring version, jstrin
// Validate java_base's loader is the boot loader.
oop loader = java_lang_Module::loader(module_handle());
if (loader != NULL) {
if (loader != nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"Class loader must be the boot class loader");
}
@ -193,10 +193,10 @@ static void define_javabase_module(Handle module_handle, jstring version, jstrin
// Ensure the boot loader's PackageEntryTable has been created
PackageEntryTable* package_table = get_package_entry_table(h_loader);
assert(pkg_list->length() == 0 || package_table != NULL, "Bad package_table");
assert(pkg_list->length() == 0 || package_table != nullptr, "Bad package_table");
// Ensure java.base's ModuleEntry has been created
assert(ModuleEntryTable::javabase_moduleEntry() != NULL, "No ModuleEntry for " JAVA_BASE_NAME);
assert(ModuleEntryTable::javabase_moduleEntry() != nullptr, "No ModuleEntry for " JAVA_BASE_NAME);
bool duplicate_javabase = false;
{
@ -216,7 +216,7 @@ static void define_javabase_module(Handle module_handle, jstring version, jstrin
// Some of java.base's packages were added early in bootstrapping, ignore duplicates.
package_table->locked_create_entry_if_absent(pkg_list->at(x),
ModuleEntryTable::javabase_moduleEntry());
assert(package_table->locked_lookup_only(pkg_list->at(x)) != NULL,
assert(package_table->locked_lookup_only(pkg_list->at(x)) != nullptr,
"Unable to create a " JAVA_BASE_NAME " package entry");
// Unable to have a GrowableArray of TempNewSymbol. Must decrement the refcount of
// the Symbol* that was created above for each package. The refcount was incremented
@ -240,11 +240,11 @@ static void define_javabase_module(Handle module_handle, jstring version, jstrin
ModuleEntryTable::patch_javabase_entries(THREAD, module_handle);
log_info(module, load)(JAVA_BASE_NAME " location: %s",
location_symbol != NULL ? location_symbol->as_C_string() : "NULL");
location_symbol != nullptr ? location_symbol->as_C_string() : "nullptr");
log_debug(module)("define_javabase_module(): Definition of module: "
JAVA_BASE_NAME ", version: %s, location: %s, package #: %d",
version_symbol != NULL ? version_symbol->as_C_string() : "NULL",
location_symbol != NULL ? location_symbol->as_C_string() : "NULL",
version_symbol != nullptr ? version_symbol->as_C_string() : "nullptr",
location_symbol != nullptr ? location_symbol->as_C_string() : "nullptr",
pkg_list->length());
// packages defined to java.base
@ -286,7 +286,7 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
int module_name_len;
char* module_name = get_module_name(module(), module_name_len, CHECK);
if (module_name == NULL) {
if (module_name == nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"Module name cannot be null");
}
@ -312,7 +312,7 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
// define_module can be called during start-up, before the class loader's ClassLoaderData
// has been created. SystemDictionary::register_loader ensures creation, if needed.
ClassLoaderData* loader_data = SystemDictionary::register_loader(h_loader);
assert(loader_data != NULL, "class loader data shouldn't be null");
assert(loader_data != nullptr, "class loader data shouldn't be null");
// Only modules defined to either the boot or platform class loader, can define a "java/" package.
bool java_pkg_disallowed = !h_loader.is_null() &&
@ -324,7 +324,7 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
GrowableArray<Symbol*>* pkg_list = new GrowableArray<Symbol*>(num_packages);
for (int x = 0; x < num_packages; x++) {
oop pkg_str = packages_h->obj_at(x);
if (pkg_str == NULL || pkg_str->klass() != vmClasses::String_klass()) {
if (pkg_str == nullptr || pkg_str->klass() != vmClasses::String_klass()) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
err_msg("Bad package name"));
}
@ -359,7 +359,7 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
}
ModuleEntryTable* module_table = get_module_entry_table(h_loader);
assert(module_table != NULL, "module entry table shouldn't be null");
assert(module_table != nullptr, "module entry table shouldn't be null");
// Create symbol* entry for module name.
TempNewSymbol module_symbol = SymbolTable::new_symbol(module_name, module_name_len);
@ -372,22 +372,22 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
// Create symbol* entry for module location.
TempNewSymbol location_symbol = as_symbol(location);
PackageEntryTable* package_table = NULL;
PackageEntry* existing_pkg = NULL;
PackageEntryTable* package_table = nullptr;
PackageEntry* existing_pkg = nullptr;
{
MutexLocker ml(THREAD, Module_lock);
if (num_packages > 0) {
package_table = get_package_entry_table(h_loader);
assert(package_table != NULL, "Missing package_table");
assert(package_table != nullptr, "Missing package_table");
// Check that none of the packages exist in the class loader's package table.
for (int x = 0; x < pkg_list->length(); x++) {
existing_pkg = package_table->locked_lookup_only(pkg_list->at(x));
if (existing_pkg != NULL) {
if (existing_pkg != nullptr) {
// This could be because the module was already defined. If so,
// report that error instead of the package error.
if (module_table->lookup_only(module_symbol) != NULL) {
if (module_table->lookup_only(module_symbol) != nullptr) {
dupl_modules = true;
}
break;
@ -396,16 +396,16 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
} // if (num_packages > 0)...
// Add the module and its packages.
if (!dupl_modules && existing_pkg == NULL) {
if (module_table->lookup_only(module_symbol) == NULL) {
if (!dupl_modules && existing_pkg == nullptr) {
if (module_table->lookup_only(module_symbol) == nullptr) {
// Create the entry for this module in the class loader's module entry table.
ModuleEntry* module_entry = module_table->locked_create_entry(module,
(is_open == JNI_TRUE), module_symbol,
version_symbol, location_symbol, loader_data);
assert(module_entry != NULL, "module_entry creation failed");
assert(module_entry != nullptr, "module_entry creation failed");
// Add the packages.
assert(pkg_list->length() == 0 || package_table != NULL, "Bad package table");
assert(pkg_list->length() == 0 || package_table != nullptr, "Bad package table");
for (int y = 0; y < pkg_list->length(); y++) {
package_table->locked_create_entry(pkg_list->at(y), module_entry);
@ -427,18 +427,18 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
if (dupl_modules) {
THROW_MSG(vmSymbols::java_lang_IllegalStateException(),
err_msg("Module %s is already defined", module_name));
} else if (existing_pkg != NULL) {
} else if (existing_pkg != nullptr) {
throw_dup_pkg_exception(module_name, existing_pkg, CHECK);
}
log_info(module, load)("%s location: %s", module_name,
location_symbol != NULL ? location_symbol->as_C_string() : "NULL");
location_symbol != nullptr ? location_symbol->as_C_string() : "null");
LogTarget(Debug, module) lt;
if (lt.is_enabled()) {
LogStream ls(lt);
ls.print("define_module(): creation of module: %s, version: %s, location: %s, ",
module_name, version_symbol != NULL ? version_symbol->as_C_string() : "NULL",
location_symbol != NULL ? location_symbol->as_C_string() : "NULL");
module_name, version_symbol != nullptr ? version_symbol->as_C_string() : "null",
location_symbol != nullptr ? location_symbol->as_C_string() : "null");
loader_data->print_value_on(&ls);
ls.print_cr(", package #: %d", pkg_list->length());
for (int y = 0; y < pkg_list->length(); y++) {
@ -590,7 +590,7 @@ void Modules::define_archived_modules(Handle h_platform_loader, Handle h_system_
// system_loader_data here is always an instance of jdk.internal.loader.ClassLoader$AppClassLoader.
// However, if -Djava.system.class.loader=xxx is specified, java_platform_loader() would
// be an instance of a user-defined class, so make sure this never happens.
assert(Arguments::get_property("java.system.class.loader") == NULL,
assert(Arguments::get_property("java.system.class.loader") == nullptr,
"archived full module should have been disabled if -Djava.system.class.loader is specified");
ClassLoaderDataShared::restore_java_system_loader_from_archive(system_loader_data);
}
@ -616,14 +616,14 @@ void Modules::set_bootloader_unnamed_module(Handle module, TRAPS) {
// Ensure that this is an unnamed module
oop name = java_lang_Module::name(module());
if (name != NULL) {
if (name != nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"boot loader's unnamed module's java.lang.Module has a name");
}
// Validate java_base's loader is the boot loader.
oop loader = java_lang_Module::loader(module());
if (loader != NULL) {
if (loader != nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"Class loader must be the boot class loader");
}
@ -633,7 +633,7 @@ void Modules::set_bootloader_unnamed_module(Handle module, TRAPS) {
// Set java.lang.Module for the boot loader's unnamed module
ClassLoaderData* boot_loader_data = ClassLoaderData::the_null_class_loader_data();
ModuleEntry* unnamed_module = boot_loader_data->unnamed_module();
assert(unnamed_module != NULL, "boot loader's unnamed ModuleEntry not defined");
assert(unnamed_module != nullptr, "boot loader's unnamed ModuleEntry not defined");
unnamed_module->set_module(boot_loader_data->add_handle(module));
// Store pointer to the ModuleEntry in the unnamed module's java.lang.Module object.
java_lang_Module::set_module_entry(module(), unnamed_module);
@ -642,7 +642,7 @@ void Modules::set_bootloader_unnamed_module(Handle module, TRAPS) {
void Modules::add_module_exports(Handle from_module, jstring package_name, Handle to_module, TRAPS) {
check_cds_restrictions(CHECK);
if (package_name == NULL) {
if (package_name == nullptr) {
THROW_MSG(vmSymbols::java_lang_NullPointerException(),
"package is null");
}
@ -651,7 +651,7 @@ void Modules::add_module_exports(Handle from_module, jstring package_name, Handl
"from_module is null");
}
ModuleEntry* from_module_entry = get_module_entry(from_module, CHECK);
if (from_module_entry == NULL) {
if (from_module_entry == nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"from_module cannot be found");
}
@ -661,16 +661,16 @@ void Modules::add_module_exports(Handle from_module, jstring package_name, Handl
ModuleEntry* to_module_entry;
if (to_module.is_null()) {
to_module_entry = NULL; // It's an unqualified export.
to_module_entry = nullptr; // It's an unqualified export.
} else {
to_module_entry = get_module_entry(to_module, CHECK);
if (to_module_entry == NULL) {
if (to_module_entry == nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"to_module is invalid");
}
}
PackageEntry* package_entry = NULL;
PackageEntry* package_entry = nullptr;
char buf[128];
int package_len;
@ -682,16 +682,16 @@ void Modules::add_module_exports(Handle from_module, jstring package_name, Handl
// Do nothing if modules are the same
// If the package is not found we'll throw an exception later
if (from_module_entry != to_module_entry &&
package_entry != NULL) {
package_entry != nullptr) {
package_entry->set_exported(to_module_entry);
}
}
// Handle errors and logging outside locked section
if (package_entry == NULL) {
if (package_entry == nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
err_msg("Package %s not found in from_module %s",
pkg != NULL ? pkg : "",
pkg != nullptr ? pkg : "",
from_module_entry->name()->as_C_string()));
}
@ -699,7 +699,7 @@ void Modules::add_module_exports(Handle from_module, jstring package_name, Handl
log_debug(module)("add_module_exports(): package %s in module %s is exported to module %s",
package_entry->name()->as_C_string(),
from_module_entry->name()->as_C_string(),
to_module_entry == NULL ? "NULL" :
to_module_entry == nullptr ? "null" :
to_module_entry->is_named() ?
to_module_entry->name()->as_C_string() : UNNAMED_MODULE);
}
@ -724,7 +724,7 @@ void Modules::add_reads_module(Handle from_module, Handle to_module, TRAPS) {
}
ModuleEntry* from_module_entry = get_module_entry(from_module, CHECK);
if (from_module_entry == NULL) {
if (from_module_entry == nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"from_module is not valid");
}
@ -732,19 +732,19 @@ void Modules::add_reads_module(Handle from_module, Handle to_module, TRAPS) {
ModuleEntry* to_module_entry;
if (!to_module.is_null()) {
to_module_entry = get_module_entry(to_module, CHECK);
if (to_module_entry == NULL) {
if (to_module_entry == nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"to_module is invalid");
}
} else {
to_module_entry = NULL;
to_module_entry = nullptr;
}
ResourceMark rm(THREAD);
log_debug(module)("add_reads_module(): Adding read from module %s to module %s",
from_module_entry->is_named() ?
from_module_entry->name()->as_C_string() : UNNAMED_MODULE,
to_module_entry == NULL ? "all unnamed" :
to_module_entry == nullptr ? "all unnamed" :
(to_module_entry->is_named() ?
to_module_entry->name()->as_C_string() : UNNAMED_MODULE));
@ -759,14 +759,14 @@ jobject Modules::get_module(jclass clazz, TRAPS) {
assert(ModuleEntryTable::javabase_defined(),
"Attempt to call get_module before " JAVA_BASE_NAME " is defined");
if (clazz == NULL) {
if (clazz == nullptr) {
THROW_MSG_(vmSymbols::java_lang_NullPointerException(),
"class is null", JNI_FALSE);
}
oop mirror = JNIHandles::resolve_non_null(clazz);
if (mirror == NULL) {
log_debug(module)("get_module(): no mirror, returning NULL");
return NULL;
if (mirror == nullptr) {
log_debug(module)("get_module(): no mirror, returning nullptr");
return nullptr;
}
if (!java_lang_Class::is_instance(mirror)) {
THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
@ -775,7 +775,7 @@ jobject Modules::get_module(jclass clazz, TRAPS) {
oop module = java_lang_Class::module(mirror);
assert(module != NULL, "java.lang.Class module field not set");
assert(module != nullptr, "java.lang.Class module field not set");
assert(java_lang_Module::is_instance(module), "module is not an instance of type java.lang.Module");
LogTarget(Debug,module) lt;
@ -784,13 +784,13 @@ jobject Modules::get_module(jclass clazz, TRAPS) {
LogStream ls(lt);
Klass* klass = java_lang_Class::as_Klass(mirror);
oop module_name = java_lang_Module::name(module);
if (module_name != NULL) {
if (module_name != nullptr) {
ls.print("get_module(): module ");
java_lang_String::print(module_name, tty);
} else {
ls.print("get_module(): Unnamed Module");
}
if (klass != NULL) {
if (klass != nullptr) {
ls.print_cr(" for class %s", klass->external_name());
} else {
ls.print_cr(" for primitive class");
@ -805,20 +805,20 @@ oop Modules::get_named_module(Handle h_loader, const char* package_name) {
"Attempt to call get_named_module before " JAVA_BASE_NAME " is defined");
assert(h_loader.is_null() || java_lang_ClassLoader::is_subclass(h_loader->klass()),
"Class loader is not a subclass of java.lang.ClassLoader");
assert(package_name != NULL, "the package_name should not be NULL");
assert(package_name != nullptr, "the package_name should not be null");
if (strlen(package_name) == 0) {
return NULL;
return nullptr;
}
TempNewSymbol package_sym = SymbolTable::new_symbol(package_name);
const PackageEntry* const pkg_entry =
get_package_entry_by_name(package_sym, h_loader);
const ModuleEntry* const module_entry = (pkg_entry != NULL ? pkg_entry->module() : NULL);
const ModuleEntry* const module_entry = (pkg_entry != nullptr ? pkg_entry->module() : nullptr);
if (module_entry != NULL && module_entry->module() != NULL && module_entry->is_named()) {
if (module_entry != nullptr && module_entry->module() != nullptr && module_entry->is_named()) {
return module_entry->module();
}
return NULL;
return nullptr;
}
// Export package in module to all unnamed modules.
@ -828,12 +828,12 @@ void Modules::add_module_exports_to_all_unnamed(Handle module, jstring package_n
THROW_MSG(vmSymbols::java_lang_NullPointerException(),
"module is null");
}
if (package_name == NULL) {
if (package_name == nullptr) {
THROW_MSG(vmSymbols::java_lang_NullPointerException(),
"package is null");
}
ModuleEntry* module_entry = get_module_entry(module, CHECK);
if (module_entry == NULL) {
if (module_entry == nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"module is invalid");
}
@ -846,22 +846,22 @@ void Modules::add_module_exports_to_all_unnamed(Handle module, jstring package_n
char buf[128];
int pkg_len;
const char* pkg = as_internal_package(JNIHandles::resolve_non_null(package_name), buf, sizeof(buf), pkg_len);
PackageEntry* package_entry = NULL;
PackageEntry* package_entry = nullptr;
{
MutexLocker m1(THREAD, Module_lock);
package_entry = get_locked_package_entry(module_entry, pkg, pkg_len);
// Mark package as exported to all unnamed modules.
if (package_entry != NULL) {
if (package_entry != nullptr) {
package_entry->set_is_exported_allUnnamed();
}
}
// Handle errors and logging outside locked section
if (package_entry == NULL) {
if (package_entry == nullptr) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
err_msg("Package %s not found in module %s",
pkg != NULL ? pkg : "",
pkg != nullptr ? pkg : "",
module_entry->name()->as_C_string()));
}