archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8169734: Update uses of string "java.base" to macro

Browse source 
Replaced instances of "java.base" string with JAVA_BASE_NAME macro

Reviewed-by: sspitsyn, dcubed
This commit is contained in:
Rachel Protacio 2016-12-05 16:08:20 -05:00
parent da0b1b46e0
commit 9c6128c943
9 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hotspot/src/share/vm/classfile/moduleEntry.cpp
View file

@ -373,12 +373,12 @@ void ModuleEntryTable::finalize_javabase(Handle module_handle, Symbol* version,
assert(module_table != NULL, "boot loader's ModuleEntryTable not defined");
if (module_handle.is_null()) {
fatal("Unable to finalize module definition for java.base");
fatal("Unable to finalize module definition for " JAVA_BASE_NAME);
}
// Set java.lang.reflect.Module, version and location for java.base
ModuleEntry* jb_module = javabase_moduleEntry();
assert(jb_module != NULL, "java.base ModuleEntry not defined");
assert(jb_module != NULL, JAVA_BASE_NAME " ModuleEntry not defined");
jb_module->set_version(version);
jb_module->set_location(location);
// Once java.base's ModuleEntry _module field is set with the known
@ -395,7 +395,8 @@ void ModuleEntryTable::finalize_javabase(Handle module_handle, Symbol* version,
// Their module field is set once java.base's java.lang.reflect.Module is known to the VM.
void ModuleEntryTable::patch_javabase_entries(Handle module_handle) {
if (module_handle.is_null()) {
fatal("Unable to patch the module field of classes loaded prior to java.base's definition, invalid java.lang.reflect.Module");
fatal("Unable to patch the module field of classes loaded prior to "
JAVA_BASE_NAME "'s definition, invalid java.lang.reflect.Module");
}
// Do the fixups for the basic primitive types