equal
deleted
inserted
replaced
3962 |
3962 |
3963 // cache the system and platform class loaders |
3963 // cache the system and platform class loaders |
3964 SystemDictionary::compute_java_loaders(CHECK_JNI_ERR); |
3964 SystemDictionary::compute_java_loaders(CHECK_JNI_ERR); |
3965 |
3965 |
3966 #if INCLUDE_CDS |
3966 #if INCLUDE_CDS |
3967 if (DumpSharedSpaces) { |
3967 // capture the module path info from the ModuleEntryTable |
3968 // capture the module path info from the ModuleEntryTable |
3968 ClassLoader::initialize_module_path(THREAD); |
3969 ClassLoader::initialize_module_path(THREAD); |
|
3970 } |
|
3971 #endif |
3969 #endif |
3972 |
3970 |
3973 #if INCLUDE_JVMCI |
3971 #if INCLUDE_JVMCI |
3974 if (force_JVMCI_intialization) { |
3972 if (force_JVMCI_intialization) { |
3975 JVMCI::initialize_compiler(CHECK_JNI_ERR); |
3973 JVMCI::initialize_compiler(CHECK_JNI_ERR); |
4167 JvmtiExport::enter_onload_phase(); |
4165 JvmtiExport::enter_onload_phase(); |
4168 |
4166 |
4169 for (agent = Arguments::agents(); agent != NULL; agent = agent->next()) { |
4167 for (agent = Arguments::agents(); agent != NULL; agent = agent->next()) { |
4170 // CDS dumping does not support native JVMTI agent. |
4168 // CDS dumping does not support native JVMTI agent. |
4171 // CDS dumping supports Java agent if the AllowArchivingWithJavaAgent diagnostic option is specified. |
4169 // CDS dumping supports Java agent if the AllowArchivingWithJavaAgent diagnostic option is specified. |
4172 if (DumpSharedSpaces) { |
4170 if (DumpSharedSpaces || DynamicDumpSharedSpaces) { |
4173 if(!agent->is_instrument_lib()) { |
4171 if(!agent->is_instrument_lib()) { |
4174 vm_exit_during_cds_dumping("CDS dumping does not support native JVMTI agent, name", agent->name()); |
4172 vm_exit_during_cds_dumping("CDS dumping does not support native JVMTI agent, name", agent->name()); |
4175 } else if (!AllowArchivingWithJavaAgent) { |
4173 } else if (!AllowArchivingWithJavaAgent) { |
4176 vm_exit_during_cds_dumping( |
4174 vm_exit_during_cds_dumping( |
4177 "Must enable AllowArchivingWithJavaAgent in order to run Java agent during CDS dumping"); |
4175 "Must enable AllowArchivingWithJavaAgent in order to run Java agent during CDS dumping"); |