src/share/vm/classfile/moduleEntry.cpp

*** 363,378 ****
    ModuleEntryTable* module_table = boot_loader_data->modules();
  
    assert(module_table != NULL, "boot loader's ModuleEntryTable not defined");
  
    if (module_handle.is_null()) {
!     fatal("Unable to finalize module definition for java.base");
    }
  
    // Set java.lang.reflect.Module, version and location for java.base
    ModuleEntry* jb_module = javabase_moduleEntry();
!   assert(jb_module != NULL, "java.base ModuleEntry not defined");
    jb_module->set_version(version);
    jb_module->set_location(location);
    // Once java.base's ModuleEntry _module field is set with the known
    // java.lang.reflect.Module, java.base is considered "defined" to the VM.
    jb_module->set_module(boot_loader_data->add_handle(module_handle));
--- 363,378 ----
    ModuleEntryTable* module_table = boot_loader_data->modules();
  
    assert(module_table != NULL, "boot loader's ModuleEntryTable not defined");
  
    if (module_handle.is_null()) {
!     fatal("Unable to finalize module definition for " JAVA_BASE_NAME);
    }
  
    // Set java.lang.reflect.Module, version and location for java.base
    ModuleEntry* jb_module = javabase_moduleEntry();
!   assert(jb_module != NULL, JAVA_BASE_NAME " ModuleEntry not defined");
    jb_module->set_version(version);
    jb_module->set_location(location);
    // Once java.base's ModuleEntry _module field is set with the known
    // java.lang.reflect.Module, java.base is considered "defined" to the VM.
    jb_module->set_module(boot_loader_data->add_handle(module_handle));
*** 385,395 ****
  // that must be set with the defining module.  During startup, prior to java.base's
  // definition, classes needing their module field set are added to the fixup_module_list.
  // Their module field is set once java.base's java.lang.reflect.Module is known to the VM.
  void ModuleEntryTable::patch_javabase_entries(Handle module_handle) {
    if (module_handle.is_null()) {
!     fatal("Unable to patch the module field of classes loaded prior to java.base's definition, invalid java.lang.reflect.Module");
    }
  
    // Do the fixups for the basic primitive types
    java_lang_Class::set_module(Universe::int_mirror(), module_handle());
    java_lang_Class::set_module(Universe::float_mirror(), module_handle());
--- 385,396 ----
  // that must be set with the defining module.  During startup, prior to java.base's
  // definition, classes needing their module field set are added to the fixup_module_list.
  // Their module field is set once java.base's java.lang.reflect.Module is known to the VM.
  void ModuleEntryTable::patch_javabase_entries(Handle module_handle) {
    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.reflect.Module");
    }
  
    // Do the fixups for the basic primitive types
    java_lang_Class::set_module(Universe::int_mirror(), module_handle());
    java_lang_Class::set_module(Universe::float_mirror(), module_handle());