src/hotspot/share/memory/metaspaceShared.cpp

*** 87,96 ****
--- 87,97 ----
  address MetaspaceShared::_i2i_entry_code_buffers = NULL;
  size_t MetaspaceShared::_i2i_entry_code_buffers_size = 0;
  void* MetaspaceShared::_shared_metaspace_static_top = NULL;
  intx MetaspaceShared::_relocation_delta;
  char* MetaspaceShared::_requested_base_address;
+ bool MetaspaceShared::_use_optimized_module_handling = true;
  
  // The CDS archive is divided into the following regions:
  //     mc  - misc code (the method entry trampolines, c++ vtables)
  //     rw  - read-write metadata
  //     ro  - read-only metadata and read-only tables
*** 2374,2383 ****
--- 2375,2385 ----
            // map_heap_regions() compares the current narrow oop and klass encodings
            // with the archived ones, so it must be done after all encodings are determined.
            static_mapinfo->map_heap_regions();
          }
        });
+     log_info(cds)("Using optimized module handling %s", MetaspaceShared::use_optimized_module_handling() ? "enabled" : "disabled");
    } else {
      unmap_archive(static_mapinfo);
      unmap_archive(dynamic_mapinfo);
      release_reserved_spaces(archive_space_rs, class_space_rs);
    }