8282690: runtime/CommandLine/VMDeprecatedOptions.java fails after JDK-8281181

Reviewed-by: dholmes, dcubed
This commit is contained in:
Ioi Lam 2022-03-08 00:19:07 +00:00
parent 50eb915a74
commit cde923dd47
2 changed files with 6 additions and 3 deletions

View file

@ -102,7 +102,6 @@ runtime/os/TestTracePageSizes.java#compiler-options 8267460 linux-aarch64
runtime/os/TestTracePageSizes.java#G1 8267460 linux-aarch64 runtime/os/TestTracePageSizes.java#G1 8267460 linux-aarch64
runtime/os/TestTracePageSizes.java#Parallel 8267460 linux-aarch64 runtime/os/TestTracePageSizes.java#Parallel 8267460 linux-aarch64
runtime/os/TestTracePageSizes.java#Serial 8267460 linux-aarch64 runtime/os/TestTracePageSizes.java#Serial 8267460 linux-aarch64
runtime/CommandLine/VMDeprecatedOptions.java 8282690 generic-all
runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64 runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
applications/jcstress/copy.java 8229852 linux-all applications/jcstress/copy.java 8229852 linux-all

View file

@ -45,6 +45,8 @@ public class VMDeprecatedOptions {
*/ */
public static final String[][] DEPRECATED_OPTIONS; public static final String[][] DEPRECATED_OPTIONS;
static { static {
// Use an ArrayList so platform-specific flags can be
// optionally added.
ArrayList<String[]> deprecated = new ArrayList( ArrayList<String[]> deprecated = new ArrayList(
Arrays.asList(new String[][] { Arrays.asList(new String[][] {
// deprecated non-alias flags: // deprecated non-alias flags:
@ -54,14 +56,16 @@ public class VMDeprecatedOptions {
{"InitialRAMFraction", "64"}, {"InitialRAMFraction", "64"},
{"TLABStats", "false"}, {"TLABStats", "false"},
{"AllowRedefinitionToAddDeleteMethods", "true"}, {"AllowRedefinitionToAddDeleteMethods", "true"},
{"UseContainerCpuShares", "false"},
{"PreferContainerQuotaForCPUCount", "true"},
// deprecated alias flags (see also aliased_jvm_flags): // deprecated alias flags (see also aliased_jvm_flags):
{"DefaultMaxRAMFraction", "4"}, {"DefaultMaxRAMFraction", "4"},
{"CreateMinidumpOnCrash", "false"} {"CreateMinidumpOnCrash", "false"}
} }
)); ));
if (Platform.isLinux()) {
deprecated.add(new String[] {"UseContainerCpuShares", "false"});
deprecated.add(new String[] {"PreferContainerQuotaForCPUCount", "true"});
}
DEPRECATED_OPTIONS = deprecated.toArray(new String[][]{}); DEPRECATED_OPTIONS = deprecated.toArray(new String[][]{});
}; };