< prev index next >

src/hotspot/share/classfile/javaClasses.cpp

Print this page

        

*** 4248,4257 **** --- 4248,4259 ---- int reflect_ConstantPool::_oop_offset; int reflect_UnsafeStaticFieldAccessorImpl::_base_offset; int jdk_internal_module_ArchivedModuleGraph::_archivedSystemModules_offset; int jdk_internal_module_ArchivedModuleGraph::_archivedModuleFinder_offset; int jdk_internal_module_ArchivedModuleGraph::_archivedMainModule_offset; + int jdk_internal_module_ArchivedModuleGraph::_archivedConfiguration_offset; + int java_lang_module_Configuration::_EMPTY_CONFIGURATION_offset; #define STACKTRACEELEMENT_FIELDS_DO(macro) \ macro(declaringClassObject_offset, k, "declaringClassObject", class_signature, false); \ macro(classLoaderName_offset, k, "classLoaderName", string_signature, false); \ macro(moduleName_offset, k, "moduleName", string_signature, false); \
*** 4410,4433 **** static int member_offset(int hardcoded_offset) { return (hardcoded_offset * heapOopSize) + instanceOopDesc::base_offset_in_bytes(); } ! #define MODULEBOOTSTRAP_FIELDS_DO(macro) \ macro(_archivedSystemModules_offset, k, "archivedSystemModules", systemModules_signature, true); \ macro(_archivedModuleFinder_offset, k, "archivedModuleFinder", moduleFinder_signature, true); \ ! macro(_archivedMainModule_offset, k, "archivedMainModule", string_signature, true) void jdk_internal_module_ArchivedModuleGraph::compute_offsets() { InstanceKlass* k = SystemDictionary::ArchivedModuleGraph_klass(); assert(k != NULL, "must be loaded"); ! MODULEBOOTSTRAP_FIELDS_DO(FIELD_COMPUTE_OFFSET); } #if INCLUDE_CDS void jdk_internal_module_ArchivedModuleGraph::serialize(SerializeClosure* f) { ! MODULEBOOTSTRAP_FIELDS_DO(FIELD_SERIALIZE_OFFSET); } #endif // Compute hard-coded offsets // Invoked before SystemDictionary::initialize, so pre-loaded classes --- 4412,4451 ---- static int member_offset(int hardcoded_offset) { return (hardcoded_offset * heapOopSize) + instanceOopDesc::base_offset_in_bytes(); } ! #define ARCHIVEDMODULEGRAPH_FIELDS_DO(macro) \ macro(_archivedSystemModules_offset, k, "archivedSystemModules", systemModules_signature, true); \ macro(_archivedModuleFinder_offset, k, "archivedModuleFinder", moduleFinder_signature, true); \ ! macro(_archivedMainModule_offset, k, "archivedMainModule", string_signature, true); \ ! macro(_archivedConfiguration_offset, k, "archivedConfiguration", configuration_signature, true) void jdk_internal_module_ArchivedModuleGraph::compute_offsets() { InstanceKlass* k = SystemDictionary::ArchivedModuleGraph_klass(); assert(k != NULL, "must be loaded"); ! ARCHIVEDMODULEGRAPH_FIELDS_DO(FIELD_COMPUTE_OFFSET); } #if INCLUDE_CDS void jdk_internal_module_ArchivedModuleGraph::serialize(SerializeClosure* f) { ! ARCHIVEDMODULEGRAPH_FIELDS_DO(FIELD_SERIALIZE_OFFSET); ! } ! #endif ! ! #define CONFIGURATION_FIELDS_DO(macro) \ ! macro(_EMPTY_CONFIGURATION_offset, k, "EMPTY_CONFIGURATION", configuration_signature, true) ! ! void java_lang_module_Configuration::compute_offsets() { ! InstanceKlass* k = SystemDictionary::Configuration_klass(); ! assert(k != NULL, "must be loaded"); ! CONFIGURATION_FIELDS_DO(FIELD_COMPUTE_OFFSET); ! } ! ! #if INCLUDE_CDS ! void java_lang_module_Configuration::serialize(SerializeClosure* f) { ! CONFIGURATION_FIELDS_DO(FIELD_SERIALIZE_OFFSET); } #endif // Compute hard-coded offsets // Invoked before SystemDictionary::initialize, so pre-loaded classes
*** 4485,4494 **** --- 4503,4513 ---- java_lang_StackTraceElement::compute_offsets(); java_lang_StackFrameInfo::compute_offsets(); java_lang_LiveStackFrameInfo::compute_offsets(); java_util_concurrent_locks_AbstractOwnableSynchronizer::compute_offsets(); + java_lang_module_Configuration::compute_offsets(); jdk_internal_module_ArchivedModuleGraph::compute_offsets(); // generated interpreter code wants to know about the offsets we just computed: AbstractAssembler::update_delayed_values(); }
< prev index next >