--- old/src/hotspot/share/memory/metaspaceShared.cpp	2020-06-10 11:20:56.071890187 -0700
+++ new/src/hotspot/share/memory/metaspaceShared.cpp	2020-06-10 11:20:55.767878744 -0700
@@ -89,6 +89,7 @@
 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)
@@ -2376,6 +2377,7 @@
           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);