src/share/vm/classfile/modules.cpp

*** 204,214 ****
    // Ensure the boot loader's PackageEntryTable has been created
    PackageEntryTable* package_table = get_package_entry_table(h_loader, CHECK);
    assert(pkg_list->length() == 0 || package_table != NULL, "Bad package_table");
  
    // Ensure java.base's ModuleEntry has been created
!   assert(ModuleEntryTable::javabase_module() != NULL, "No ModuleEntry for java.base");
  
    bool duplicate_javabase = false;
    {
      MutexLocker m1(Module_lock, THREAD);
  
--- 204,214 ----
    // Ensure the boot loader's PackageEntryTable has been created
    PackageEntryTable* package_table = get_package_entry_table(h_loader, CHECK);
    assert(pkg_list->length() == 0 || package_table != NULL, "Bad package_table");
  
    // Ensure java.base's ModuleEntry has been created
!   assert(ModuleEntryTable::javabase_moduleEntry() != NULL, "No ModuleEntry for java.base");
  
    bool duplicate_javabase = false;
    {
      MutexLocker m1(Module_lock, THREAD);
  
*** 224,234 ****
        // loop through and add any new packages for java.base
        PackageEntry* pkg;
        for (int x = 0; x < pkg_list->length(); x++) {
          // Some of java.base's packages were added early in bootstrapping, ignore duplicates.
          if (package_table->lookup_only(pkg_list->at(x)) == NULL) {
!           pkg = package_table->locked_create_entry_or_null(pkg_list->at(x), ModuleEntryTable::javabase_module());
            assert(pkg != NULL, "Unable to create a java.base package entry");
          }
          // Unable to have a GrowableArray of TempNewSymbol.  Must decrement the refcount of
          // the Symbol* that was created above for each package. The refcount was incremented
          // by SymbolTable::new_symbol and as well by the PackageEntry creation.
--- 224,234 ----
        // loop through and add any new packages for java.base
        PackageEntry* pkg;
        for (int x = 0; x < pkg_list->length(); x++) {
          // Some of java.base's packages were added early in bootstrapping, ignore duplicates.
          if (package_table->lookup_only(pkg_list->at(x)) == NULL) {
!           pkg = package_table->locked_create_entry_or_null(pkg_list->at(x), ModuleEntryTable::javabase_moduleEntry());
            assert(pkg != NULL, "Unable to create a java.base package entry");
          }
          // Unable to have a GrowableArray of TempNewSymbol.  Must decrement the refcount of
          // the Symbol* that was created above for each package. The refcount was incremented
          // by SymbolTable::new_symbol and as well by the PackageEntry creation.
*** 253,265 ****
    // packages defined to java.base
    for (int x = 0; x < pkg_list->length(); x++) {
      log_trace(modules)("define_javabase_module(): creation of package %s for module java.base",
                         (pkg_list->at(x))->as_C_string());
    }
- 
-   // Patch any previously loaded classes' module field with java.base's jlr.Module.
-   ModuleEntryTable::patch_javabase_entries(module_handle);
  }
  
  void Modules::define_module(jobject module, jstring version,
                              jstring location, jobjectArray packages, TRAPS) {
    ResourceMark rm(THREAD);
--- 253,262 ----