--- a/src/hotspot/share/oops/instanceKlass.cpp Wed Oct 02 13:57:03 2019 -0400
+++ b/src/hotspot/share/oops/instanceKlass.cpp Wed Oct 02 16:55:08 2019 -0700
@@ -453,7 +453,7 @@
assert(is_instance_klass(), "is layout incorrect?");
assert(size_helper() == parser.layout_size(), "incorrect size_helper?");
- if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
+ if (Arguments::is_dumping_archive()) {
SystemDictionaryShared::init_dumptime_info(this);
}
}
@@ -603,7 +603,7 @@
}
set_annotations(NULL);
- if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
+ if (Arguments::is_dumping_archive()) {
SystemDictionaryShared::remove_dumptime_info(this);
}
}
@@ -2229,7 +2229,7 @@
// (1) We are running AOT to generate a shared library.
return true;
}
- if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
+ if (Arguments::is_dumping_archive()) {
// (2) We are running -Xshare:dump or -XX:ArchiveClassesAtExit to create a shared archive
return true;
}
@@ -2477,7 +2477,7 @@
// notify ClassLoadingService of class unload
ClassLoadingService::notify_class_unloaded(ik);
- if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
+ if (Arguments::is_dumping_archive()) {
SystemDictionaryShared::remove_dumptime_info(ik);
}