archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8213439: Run class initialization for boot loader classes with registered subgraph archiving entry field during CDS dump time

Browse source 
Run class initialization for boot classes with registered subgraph archiving entry fieldi(s) at CDS dump time.

Reviewed-by: dholmes, iklam
This commit is contained in:
Jiangli Zhou 2018-11-08 19:16:16 -05:00
parent 9dbaf4936f
commit a73856351a
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/memory/heapShared.cpp
View file

@ -886,6 +886,10 @@ void HeapShared::init_subgraph_entry_fields(ArchivableStaticFieldInfo fields[],
Klass* k = SystemDictionary::resolve_or_null(klass_name, THREAD); Klass* k = SystemDictionary::resolve_or_null(klass_name, THREAD);
assert(k != NULL && !HAS_PENDING_EXCEPTION, "class must exist"); assert(k != NULL && !HAS_PENDING_EXCEPTION, "class must exist");
InstanceKlass* ik = InstanceKlass::cast(k); InstanceKlass* ik = InstanceKlass::cast(k);
assert(InstanceKlass::cast(ik)->is_shared_boot_class(),
"Only support boot classes");
ik->initialize(THREAD);
guarantee(!HAS_PENDING_EXCEPTION, "exception in initialize");
ArchivableStaticFieldFinder finder(ik, field_name); ArchivableStaticFieldFinder finder(ik, field_name);
ik->do_local_static_fields(&finder); ik->do_local_static_fields(&finder);

3
src/hotspot/share/memory/metaspaceShared.cpp
View file

@ -1703,6 +1703,8 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
log_info(cds)("Shared spaces: preloaded %d classes", class_count); log_info(cds)("Shared spaces: preloaded %d classes", class_count);
HeapShared::init_subgraph_entry_fields(THREAD);
// Rewrite and link classes // Rewrite and link classes
tty->print_cr("Rewriting and linking classes ..."); tty->print_cr("Rewriting and linking classes ...");
@ -1714,7 +1716,6 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
tty->print_cr("Rewriting and linking classes: done"); tty->print_cr("Rewriting and linking classes: done");
SystemDictionary::clear_invoke_method_table(); SystemDictionary::clear_invoke_method_table();
HeapShared::init_subgraph_entry_fields(THREAD);
VM_PopulateDumpSharedSpace op; VM_PopulateDumpSharedSpace op;
VMThread::execute(&op); VMThread::execute(&op);