stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8202684: Minimal VM build is broken after JDK-8199067, JDK-8202638

Browse Source 
Reviewed-by: eosterlund, stuefe
This commit is contained in:
Aleksey Shipilev 2018-05-05 18:55:31 +02:00
parent a313d5961a
commit aef2df31e6
3 changed files with 9 additions and 1 deletions
src/hotspot/share
memory/metaspace
metaspaceDCmd.cpp
utilities
macros.hpp
test/hotspot/gtest/runtime
test_committed_virtualmemory.cpp

2
src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp

@ -70,7 +70,7 @@ void MetaspaceDCmd::execute(DCmdSource source, TRAPS) {
if (strcasecmp("dynamic", scale_value) == 0) {
scale = 0;
} else {
scale = NMTUtil::scale_from_name(scale_value);
scale = NMT_ONLY(NMTUtil::scale_from_name(scale_value)) NOT_NMT(0);
if (scale == 0) {
output()->print_cr("Invalid scale: \"%s\". Will use dynamic scaling.", scale_value);
}

4
src/hotspot/share/utilities/macros.hpp

@ -218,9 +218,13 @@
#if INCLUDE_NMT
#define NOT_NMT_RETURN /* next token must be ; */
#define NOT_NMT_RETURN_(code) /* next token must be ; */
#define NMT_ONLY(x) x
#define NOT_NMT(x)
#else
#define NOT_NMT_RETURN {}
#define NOT_NMT_RETURN_(code) { return code; }
#define NMT_ONLY(x)
#define NOT_NMT(x) x
#endif // INCLUDE_NMT
#ifndef INCLUDE_TRACE

4
test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp

@ -26,6 +26,8 @@
// Included early because the NMT flags don't include it.
#include "utilities/macros.hpp"
#if INCLUDE_NMT
#include "runtime/thread.hpp"
#include "services/memTracker.hpp"
#include "services/virtualMemoryTracker.hpp"
@ -208,3 +210,5 @@ TEST_VM(CommittedVirtualMemoryTracker, test_committed_virtualmemory_region) {
CommittedVirtualMemoryTest::test_committed_region();
CommittedVirtualMemoryTest::test_partial_region();
}
#endif // INCLUDE_NMT