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

8249262: Initialize InstanceKlass::_package_entry during CDS dump time

Browse source 
Reviewed-by: iklam, minqi
This commit is contained in:
Calvin Cheung 2021-01-28 16:17:46 +00:00
parent 3aabbd7216
commit bbbfaa58c0
7 changed files with 64 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/hotspot/share/oops/instanceKlass.cpp
View file

@ -2538,7 +2538,7 @@ void InstanceKlass::remove_unshareable_info() {
_oop_map_cache = NULL;
// clear _nest_host to ensure re-load at runtime
_nest_host = NULL;
_package_entry = NULL;
init_shared_package_entry();
_dep_context_last_cleaned = 0;
}
@ -2551,6 +2551,27 @@ void InstanceKlass::remove_java_mirror() {
}
}
void InstanceKlass::init_shared_package_entry() {
#if !INCLUDE_CDS_JAVA_HEAP
_package_entry = NULL;
#else
if (!MetaspaceShared::use_full_module_graph()) {
_package_entry = NULL;
} else if (DynamicDumpSharedSpaces) {
if (!MetaspaceShared::is_in_shared_metaspace(_package_entry)) {
_package_entry = NULL;
}
} else {
if (is_shared_unregistered_class()) {
_package_entry = NULL;
} else {
_package_entry = PackageEntry::get_archived_entry(_package_entry);
}
}
ArchivePtrMarker::mark_pointer((address**)&_package_entry);
#endif
}
void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain,
PackageEntry* pkg_entry, TRAPS) {
// SystemDictionary::add_to_hierarchy() sets the init_state to loaded
@ -2834,6 +2855,15 @@ void InstanceKlass::set_package(ClassLoaderData* loader_data, PackageEntry* pkg_
check_prohibited_package(name(), loader_data, CHECK);
}
if (is_shared() && _package_entry == pkg_entry) {
if (MetaspaceShared::use_full_module_graph()) {
// we can use the saved package
return;
} else {
_package_entry = NULL;
}
}
// ClassLoader::package_from_class_name has already incremented the refcount of the symbol
// it returns, so we need to decrement it when the current function exits.
TempNewSymbol from_class_name =