8255990: Bitmap region of dynamic CDS archive is not unmapped

Reviewed-by: iklam, minqi
openjdk · Nov 12, 2020 · c6ab0fd · c6ab0fd
1 parent 943acd2
commit c6ab0fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
@@ -1748,6 +1748,7 @@ void MetaspaceShared::initialize_shared_spaces() {
     SymbolTable::serialize_shared_table_header(&rc, false);
     SystemDictionaryShared::serialize_dictionary_headers(&rc, false);
     dynamic_mapinfo->close();
+    dynamic_mapinfo->unmap_region(MetaspaceShared::bm);
   }
 
   if (PrintSharedArchiveAndExit) {

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java
@@ -91,6 +91,8 @@ static void doTest() throws Exception {
         String topArchiveName  = getNewArchiveName("top");
 
         String runtimeMsg = "Try to map archive(s) at an alternative address";
+        String unmapPrefix = ".*Unmapping region #3 at base 0x.*";
+        String unmapPattern = unmapPrefix + "(Bitmap)";
         String unlockArg = "-XX:+UnlockDiagnosticVMOptions";
 
         // (1) Dump base archive (static)
@@ -121,7 +123,12 @@ static void doTest() throws Exception {
             "-cp", appJar, mainClass)
             .assertNormalExit(output -> {
                     if (run_reloc) {
-                        output.shouldContain(runtimeMsg);
+                        output.shouldContain(runtimeMsg)
+                              // Check that there are two of the following lines in
+                              // the output. One for static archive and one for
+                              // dynamic archive:
+                              // Unmapping region #3 at base 0x<hex digits> (Bitmap)
+                              .shouldMatchByLine(unmapPrefix, "Hello World", unmapPattern);
                     }
                 });
     }