From b430cf6528c188802a1547803a27e164368a81f0 Mon Sep 17 00:00:00 2001 From: Denghui Dong Date: Fri, 31 Jul 2020 14:53:12 +0800 Subject: [PATCH] [Misc] Make EnableJFR obsolete Summary: make EnableJFR obsolete Test Plan: java -XX:+/-EnableJFR -version Reviewed-by: zhengxiaolinX Issue: https://github.com/alibaba/dragonwell8/issues/119 --- src/share/vm/runtime/arguments.cpp | 1 + src/share/vm/runtime/java.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp index 9e079cd3a..cbe41a6ff 100644 --- a/src/share/vm/runtime/arguments.cpp +++ b/src/share/vm/runtime/arguments.cpp @@ -323,6 +323,7 @@ static ObsoleteFlag obsolete_jvm_flags[] = { { "AutoShutdownNMT", JDK_Version::jdk_update(8, 40), JDK_Version::jdk(10) }, { "CompilationRepeat", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "SegmentedHeapDumpThreshold", JDK_Version::jdk_update(8, 252), JDK_Version::jdk(10) }, + { "EnableJFR", JDK_Version::jdk_update(8, 262), JDK_Version::jdk(9) }, #ifdef PRODUCT { "DesiredMethodLimit", JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, diff --git a/src/share/vm/runtime/java.hpp b/src/share/vm/runtime/java.hpp index 6b9086793..b1240daf4 100644 --- a/src/share/vm/runtime/java.hpp +++ b/src/share/vm/runtime/java.hpp @@ -138,7 +138,7 @@ class JDK_Version VALUE_OBJ_CLASS_SPEC { return JDK_Version(m); } - static JDK_Version jdk_update(uint8_t major, uint8_t update_number) { + static JDK_Version jdk_update(uint8_t major, uint16_t update_number) { return JDK_Version(major, 0, 0, update_number); } -- GitLab