Fix code cache cleanup in JitBuilder and TestCompiler on z/OS

The allocated code cache memory was not being freed up on z/OS causing memory leaks and eventual failure of tests which would not be able to allocate code cache memory. Signed-off-by: Filip Jeremic <fjeremic@ca.ibm.com>
eclipse · Jan 17, 2020 · 4a3841c · 4a3841c
1 parent 5de40f9
commit 4a3841c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/fvtest/compilertest/runtime/TestCodeCacheManager.cpp b/fvtest/compilertest/runtime/TestCodeCacheManager.cpp
@@ -92,6 +92,8 @@ TestCompiler::CodeCacheManager::freeCodeCacheSegment(TR::CodeCacheMemorySegment
    {
 #if defined(OMR_OS_WINDOWS)
    VirtualFree(memSegment->_base, 0, MEM_RELEASE); // second arg must be zero when calling with MEM_RELEASE
+#elif defined(J9ZOS390)
+   free(memSegment->_base);
 #else
    munmap(memSegment->_base, memSegment->_top - memSegment->_base + sizeof(TR::CodeCacheMemorySegment));
 #endif

diff --git a/jitbuilder/runtime/JBCodeCacheManager.cpp b/jitbuilder/runtime/JBCodeCacheManager.cpp
@@ -117,6 +117,8 @@ JitBuilder::CodeCacheManager::freeCodeCacheSegment(TR::CodeCacheMemorySegment *
    {
 #if defined(OMR_OS_WINDOWS)
    VirtualFree(memSegment->_base, 0, MEM_RELEASE); // second arg must be zero when calling with MEM_RELEASE
+#elif defined(J9ZOS390)
+   free(memSegment->_base);
 #else
    munmap(memSegment->_base, memSegment->_top - memSegment->_base + sizeof(TR::CodeCacheMemorySegment));
 #endif