Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/hotspot/share/classfile/javaClasses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,8 @@ void java_lang_Class::initialize_mirror_fields(Klass* k,

// Set the java.lang.Module module field in the java_lang_Class mirror
void java_lang_Class::set_mirror_module_field(JavaThread* current, Klass* k, Handle mirror, Handle module) {
// skip for classlib8
CLASSLIB8_EARLY_RETURN_();
if (module.is_null()) {
// During startup, the module may be NULL only if java.base has not been defined yet.
// Put the class on the fixup_module_list to patch later when the java.lang.Module
Expand Down
2 changes: 2 additions & 0 deletions src/hotspot/share/classfile/moduleEntry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,8 @@ void ModuleEntryTable::finalize_javabase(Handle module_handle, Symbol* version,
// classes needing their module field set are added to the fixup_module_list.
// Their module field is set once java.base's java.lang.Module is known to the VM.
void ModuleEntryTable::patch_javabase_entries(Handle module_handle) {
// skip for classlib8
CLASSLIB8_EARLY_RETURN_();
if (module_handle.is_null()) {
fatal("Unable to patch the module field of classes loaded prior to "
JAVA_BASE_NAME "'s definition, invalid java.lang.Module");
Expand Down
Loading