From 561c9182e83ed512770c9d5728cb07742f372f92 Mon Sep 17 00:00:00 2001 From: Calvin Cheung Date: Fri, 31 May 2019 15:49:12 -0700 Subject: [PATCH] 8223336: Assert in VirtualMemoryTracker::remove_released_region when running the SharedArchiveConsistency.java test with -XX:NativeMemoryTracking=detail Added the missing call MemTracker::record_virtual_memory_reserve_and_commit() Reviewed-by: jiangli, zgu --- src/hotspot/os/windows/os_windows.cpp | 3 +++ test/hotspot/jtreg/ProblemList.txt | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp index e0b84651624..2a300e1e0d6 100644 --- a/src/hotspot/os/windows/os_windows.cpp +++ b/src/hotspot/os/windows/os_windows.cpp @@ -4910,6 +4910,9 @@ char* os::pd_map_memory(int fd, const char* file_name, size_t file_offset, return NULL; } + // Record virtual memory allocation + MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, CALLER_PC); + DWORD bytes_read; OVERLAPPED overlapped; overlapped.Offset = (DWORD)file_offset; diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index cfd0ec831bc..737da5ed0cd 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -81,7 +81,6 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8193639 solaris-all runtime/SharedArchiveFile/SASymbolTableTest.java 8193639 solaris-all runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64 -runtime/appcds/SharedArchiveConsistency.java 8223336 windows-all #############################################################################