diff --git a/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStringCaseUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStringCaseUsage.java index c5e8a0a296b2..986c79cff565 100644 --- a/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStringCaseUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStringCaseUsage.java @@ -54,7 +54,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) { } String calleeName = callee.getName(); if (calleeName.equals(TO_LOWER_CASE_METHOD_NAME) || calleeName.equals(TO_UPPER_CASE_METHOD_NAME)) { - throw new VerificationError(t, "call to parameterless %s is prohibited to avoid localization issues. Please pass a locale such as 'Locale.ENGLISH' explicitly.", + throw new VerificationError(t, "call to parameterless %s is prohibited to avoid localization issues. Please pass a locale such as 'Locale.ROOT' explicitly.", callee.format("%H.%n(%p)")); } } diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFileDisassemblerProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFileDisassemblerProvider.java index 242b3518ecdf..e1f1225fecf9 100644 --- a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFileDisassemblerProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFileDisassemblerProvider.java @@ -154,7 +154,7 @@ static class HexCodeFileDisTool { arch = "amd64"; } int wordWidth = arch.endsWith("64") ? 64 : Integer.parseInt(Services.getSavedProperty("sun.arch.data.model", "64")); - String hcf = new HexCodeFile(code, 0L, arch.toLowerCase(Locale.ENGLISH), wordWidth).toEmbeddedString(); + String hcf = new HexCodeFile(code, 0L, arch.toLowerCase(Locale.ROOT), wordWidth).toEmbeddedString(); try { toolMethod.invokeExact(hcf); } catch (Throwable e) { diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java index b4e769aafcbc..ca6358a2bcc5 100644 --- a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java @@ -211,7 +211,7 @@ public int getPhaseSkipOdds() { @Override public String toString() { return String.format("%s%n%s%nProbability of inserting a phase: 1/%s (-Dtest.graal.skip.phase.insertion.odds.%s=%s)%n", - super.toString(), ignoredPhasesToString(), phaseSkipOdds, String.join(".", getTierName().toLowerCase(Locale.ENGLISH).split(" ")), phaseSkipOdds); + super.toString(), ignoredPhasesToString(), phaseSkipOdds, String.join(".", getTierName().toLowerCase(Locale.ROOT).split(" ")), phaseSkipOdds); } @Override diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java index daa283133832..33994eded5e3 100644 --- a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java @@ -304,7 +304,7 @@ protected String ignoredPhasesToString() { return "Every phase that was given is in the resulting tier plan."; } Formatter formatter = new Formatter(); - formatter.format("Phase%s in %s ignored by the fuzzer:%n", getIgnoredPhases().size() > 1 ? "s" : "", getTierName().toLowerCase(Locale.ENGLISH)); + formatter.format("Phase%s in %s ignored by the fuzzer:%n", getIgnoredPhases().size() > 1 ? "s" : "", getTierName().toLowerCase(Locale.ROOT)); for (BasePhase phase : getIgnoredPhases()) { if (phase instanceof PhaseSuite) { formatter.format("%s", PrintingUtils.indent(phase.toString())); diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugContext.java index 8ab2c67ef2ad..65a5fecdcb5d 100644 --- a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugContext.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugContext.java @@ -1896,7 +1896,7 @@ public static String applyFormattingFlagsAndWidth(String s, int flags, int width String res = sb.toString(); if ((flags & UPPERCASE) == UPPERCASE) { - res = res.toUpperCase(Locale.ENGLISH); + res = res.toUpperCase(Locale.ROOT); } return res; } diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionClass.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionClass.java index a6d569f1a51c..4b707fb40360 100644 --- a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionClass.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionClass.java @@ -323,7 +323,7 @@ String toString(LIRInstruction obj) { StringBuilder result = new StringBuilder(); appendValues(result, obj, "", " = ", "(", ")", new String[]{""}, defs); - result.append(String.valueOf(getOpcode(obj)).toUpperCase(Locale.ENGLISH)); + result.append(String.valueOf(getOpcode(obj)).toUpperCase(Locale.ROOT)); appendValues(result, obj, " ", "", "(", ")", new String[]{"", "~"}, uses, alives); appendValues(result, obj, " ", "", "{", "}", new String[]{""}, temps); diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java index 437f54d013e0..02eada920073 100644 --- a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java @@ -774,7 +774,7 @@ public enum MandatoryStages { * is found, returns {@link #COMMUNITY}. */ public static MandatoryStages getFromName(String name) { - switch (name.toLowerCase(Locale.ENGLISH)) { + switch (name.toLowerCase(Locale.ROOT)) { case "economy": return ECONOMY; case "community": diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionsParser.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionsParser.java index 92ae52a85122..fb411ea8af11 100644 --- a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionsParser.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionsParser.java @@ -212,7 +212,7 @@ public static Object parseOptionValue(OptionDescriptor desc, Object uncheckedVal } private static long parseLong(String v) { - String valueString = v.toLowerCase(Locale.ENGLISH); + String valueString = v.toLowerCase(Locale.ROOT); long scale = 1; if (valueString.endsWith("k")) { scale = 1024L; diff --git a/espresso/src/com.oracle.truffle.espresso.processor/src/com/oracle/truffle/espresso/processor/NativeEnvProcessor.java b/espresso/src/com.oracle.truffle.espresso.processor/src/com/oracle/truffle/espresso/processor/NativeEnvProcessor.java index c503fea3087a..467dce020cf8 100644 --- a/espresso/src/com.oracle.truffle.espresso.processor/src/com/oracle/truffle/espresso/processor/NativeEnvProcessor.java +++ b/espresso/src/com.oracle.truffle.espresso.processor/src/com/oracle/truffle/espresso/processor/NativeEnvProcessor.java @@ -155,7 +155,7 @@ private void initClosure(IntrinsificationTarget target) { this.envPackage = target.envPackage; this.envClassName = target.envClassName; - this.envName = envClassName.toLowerCase(Locale.ENGLISH); + this.envName = envClassName.toLowerCase(Locale.ROOT); this.imports = envPackage + "." + envClassName + ";\n"; } diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java index 4adec009f96f..5016d44b3470 100644 --- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java +++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java @@ -263,7 +263,7 @@ public enum SpecComplianceMode { @Override public SpecComplianceMode apply(String s) { try { - return SpecComplianceMode.valueOf(s.toUpperCase(Locale.ENGLISH)); + return SpecComplianceMode.valueOf(s.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException e) { throw new IllegalArgumentException("--java.SpecCompliance: Mode can be 'strict' or 'hotspot'."); } @@ -286,7 +286,7 @@ public enum VerifyMode { @Override public VerifyMode apply(String s) { try { - return VerifyMode.valueOf(s.toUpperCase(Locale.ENGLISH)); + return VerifyMode.valueOf(s.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException e) { throw new IllegalArgumentException("-Xverify: Mode can be 'none', 'remote' or 'all'."); } @@ -342,7 +342,7 @@ public LivenessAnalysisMode apply(String s) { return LivenessAnalysisMode.NONE; } try { - return LivenessAnalysisMode.valueOf(s.toUpperCase(Locale.ENGLISH)); + return LivenessAnalysisMode.valueOf(s.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException e) { throw new IllegalArgumentException("--java.LivenessAnalysis can only be 'none'|'false', 'auto' or 'all'|'true'."); } @@ -639,7 +639,7 @@ public enum JImageMode { @Override public JImageMode apply(String s) { try { - return JImageMode.valueOf(s.toUpperCase(Locale.ENGLISH)); + return JImageMode.valueOf(s.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException e) { throw new IllegalArgumentException("JImage: Mode can be 'native', 'java'."); } diff --git a/sdk/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java b/sdk/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java index c9d9118889d7..21a287c4162d 100644 --- a/sdk/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java +++ b/sdk/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java @@ -62,7 +62,7 @@ public class Main { static { String logLevel = System.getenv(LOGGING_PROP); if (logLevel != null) { - Level level = Level.parse(logLevel.toUpperCase(Locale.ENGLISH)); + Level level = Level.parse(logLevel.toUpperCase(Locale.ROOT)); LOGGER.setLevel(level); Handler[] handlers = Logger.getLogger("").getHandlers(); for (Handler h : handlers) { diff --git a/sdk/src/org.graalvm.nativebridge.processor/src/org/graalvm/nativebridge/processor/AbstractBridgeGenerator.java b/sdk/src/org.graalvm.nativebridge.processor/src/org/graalvm/nativebridge/processor/AbstractBridgeGenerator.java index febe847b67ff..fb9958e0e750 100644 --- a/sdk/src/org.graalvm.nativebridge.processor/src/org/graalvm/nativebridge/processor/AbstractBridgeGenerator.java +++ b/sdk/src/org.graalvm.nativebridge.processor/src/org/graalvm/nativebridge/processor/AbstractBridgeGenerator.java @@ -1080,7 +1080,7 @@ private static DeclaredType getComponentType(TypeMirror arrayType, Types types) } private static String cacheEntryName(CharSequence name) { - return name.toString().replace('.', '_').toUpperCase(Locale.ENGLISH) + "_BINARY_NAME"; + return name.toString().replace('.', '_').toUpperCase(Locale.ROOT) + "_BINARY_NAME"; } } } diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java index 08198bd664cf..22f03945e961 100644 --- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java +++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java @@ -170,7 +170,7 @@ protected void onValueUpdate(EconomicMap, Object> values, Boolean o public static final OptionKey AnalysisContextSensitivity = new OptionKey<>("insens") { @Override protected void onValueUpdate(EconomicMap, Object> values, String oldValue, String newValue) { - switch (newValue.toLowerCase(Locale.ENGLISH)) { + switch (newValue.toLowerCase(Locale.ROOT)) { case "insens": AllocationSiteSensitiveHeap.update(values, false); MinHeapContextDepth.update(values, 0); diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/SectionName.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/SectionName.java index 9af6799b7e34..36670f382eb1 100644 --- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/SectionName.java +++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/SectionName.java @@ -126,7 +126,7 @@ public String getSegmentName(ObjectFile.Format f) { // default implementation switch (f) { case MACH_O: - return getFormatDependentName(f).toUpperCase(Locale.ENGLISH); + return getFormatDependentName(f).toUpperCase(Locale.ROOT); default: case ELF: return null; diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java index afe1e3afa0a4..ce74919ecefa 100644 --- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java +++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java @@ -87,7 +87,7 @@ int flags() { abstract int flags(); public static ELFMachine from(String s) { - switch (s.toLowerCase(Locale.ENGLISH)) { + switch (s.toLowerCase(Locale.ROOT)) { case "amd64": case "x86_64": return X86_64; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/Target_jdk_internal_misc_Signal.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/Target_jdk_internal_misc_Signal.java index 8e16583dea90..23ccc34865d8 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/Target_jdk_internal_misc_Signal.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/Target_jdk_internal_misc_Signal.java @@ -118,7 +118,7 @@ static void ensureInitialized() { if (signalDispatcherThread.getState() == Thread.State.NEW) { if (!jdkMiscSignalInit()) { VMError.shouldNotReachHere("Native state initialization for jdk.internal.misc.Signal failed with error code: 0x" + - Integer.toUnsignedString(WinBase.GetLastError(), 16).toUpperCase(Locale.ENGLISH)); + Integer.toUnsignedString(WinBase.GetLastError(), 16).toUpperCase(Locale.ROOT)); } RuntimeSupport.getRuntimeSupport().addTearDownHook(isFirstIsolate -> osTerminateSignalThread()); signalDispatcherThread.start(); diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/OS.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/OS.java index f328dcb41134..f32d79039c0d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/OS.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/OS.java @@ -50,7 +50,7 @@ public enum OS { * Returns a string that can be used in a package name. */ public String asPackageName() { - return name().toLowerCase(Locale.ENGLISH); + return name().toLowerCase(Locale.ROOT); } public boolean isCurrent() { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java index 0e924c065d84..aa761c6576e7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java @@ -119,7 +119,7 @@ protected SystemPropertiesSupport() { initializeProperty("java.vendor", vm.vendor); initializeProperty("java.vendor.url", vm.vendorUrl); initializeProperty("java.vendor.version", vm.vendorVersion); - assert vm.info.equals(vm.info.toLowerCase(Locale.ENGLISH)) : "java.vm.info should not contain uppercase characters"; + assert vm.info.equals(vm.info.toLowerCase(Locale.ROOT)) : "java.vm.info should not contain uppercase characters"; initializeProperty("java.vm.info", vm.info); initializeProperty("java.vm.name", "Substrate VM"); initializeProperty("java.vm.vendor", vm.vendor); diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_nio_charset_Charset.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_nio_charset_Charset.java index 2b9cb21f3d94..1b2d1d9e1031 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_nio_charset_Charset.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_nio_charset_Charset.java @@ -78,7 +78,7 @@ private static Charset lookup2(String charsetName) { } Map charsets = ImageSingletons.lookup(LocalizationSupport.class).charsets; - Charset cs = charsets.get(charsetName.toLowerCase(Locale.ENGLISH)); + Charset cs = charsets.get(charsetName.toLowerCase(Locale.ROOT)); if (cs != null) { cache(charsetName, cs); return cs; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogConfiguration.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogConfiguration.java index c54babe1ec39..ac2e44cdf2cd 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogConfiguration.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogConfiguration.java @@ -93,7 +93,7 @@ private static void verifySelections(JfrLogSelection[] selections) { for (JfrLogSelection selection : selections) { if (!selection.matchesATagSet) { throw new IllegalArgumentException("No tag set matches tag combination " + - selection.tags.toString().toLowerCase(Locale.ENGLISH) + (selection.wildcard ? "*" : "") + " for FlightRecorderLogging"); + selection.tags.toString().toLowerCase(Locale.ROOT) + (selection.wildcard ? "*" : "") + " for FlightRecorderLogging"); } } } @@ -136,7 +136,7 @@ private static JfrLogSelection parse(String str) { if ((equalsIndex = str.indexOf('=')) > 0) { String value = str.substring(equalsIndex + 1); try { - level = JfrLogLevel.valueOf(value.toUpperCase(Locale.ENGLISH)); + level = JfrLogLevel.valueOf(value.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException | NullPointerException e) { throw new IllegalArgumentException("Invalid log level '" + value + "' for FlightRecorderLogging.", e); } @@ -156,7 +156,7 @@ private static JfrLogSelection parse(String str) { for (String s : tagsStr.split("\\+")) { try { - tags.add(JfrLogTag.valueOf(s.toUpperCase(Locale.ENGLISH))); + tags.add(JfrLogTag.valueOf(s.toUpperCase(Locale.ROOT))); } catch (IllegalArgumentException | NullPointerException e) { throw new IllegalArgumentException("Invalid log tag '" + s + "' for FlightRecorderLogging.", e); } diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogging.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogging.java index 5c3e3dc9ede6..f4243c721b2f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogging.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogging.java @@ -115,7 +115,7 @@ private static String[] createLogLevels() { LogLevel[] values = LogLevel.values(); String[] result = new String[getMaxLogLevel(values) + 1]; for (LogLevel logLevel : values) { - result[getLevel(logLevel)] = logLevel.toString().toLowerCase(Locale.ENGLISH); + result[getLevel(logLevel)] = logLevel.toString().toLowerCase(Locale.ROOT); } return result; } @@ -141,7 +141,7 @@ private static String[] createLogTagSets() { if (builder.length() > 0) { builder.append(","); } - builder.append(logTag.toString().toLowerCase(Locale.ENGLISH)); + builder.append(logTag.toString().toLowerCase(Locale.ROOT)); } result[getId(logTagSet)] = builder.toString(); } diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java index e2beb9f5ea09..60c66613fdcb 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java @@ -116,7 +116,7 @@ public Stream> getValuesWithOrigins() { @Override public String toString() { - return "<" + ClassUtil.getUnqualifiedName(valueType).toLowerCase(Locale.ENGLISH) + ">*"; + return "<" + ClassUtil.getUnqualifiedName(valueType).toLowerCase(Locale.ROOT) + ">*"; } public static final class Strings extends LocatableMultiOptionValue { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionUtils.java index d168c4e03278..c6f856e88104 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionUtils.java @@ -111,7 +111,7 @@ public String getDescriptionPrefix(boolean commandLineStyle) { @Override public String toString() { - return name().toLowerCase(Locale.ENGLISH); + return name().toLowerCase(Locale.ROOT); } } diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java index 63e041f79cdd..06ed2cdfb4f9 100644 --- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java +++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java @@ -295,7 +295,7 @@ private static List getAnnotationsByType(OptionDescrip } private static String startLowerCase(String str) { - return str.substring(0, 1).toLowerCase(Locale.ENGLISH) + str.substring(1); + return str.substring(0, 1).toLowerCase(Locale.ROOT) + str.substring(1); } @Override diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java index 3038dc43f44c..e6dbbe5d371c 100644 --- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java +++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java @@ -120,7 +120,7 @@ public class NativeImage { static final String platform = getPlatform(); private static String getPlatform() { - return (OS.getCurrent().className + "-" + SubstrateUtil.getArchitectureName()).toLowerCase(Locale.ENGLISH); + return (OS.getCurrent().className + "-" + SubstrateUtil.getArchitectureName()).toLowerCase(Locale.ROOT); } static final String graalvmVendor = VM.getVendor(); @@ -1211,10 +1211,10 @@ private int completeImageBuild() { if (getHostedOptionArgumentValue(imageBuilderArgs, oHName) == null) { /* Also no explicit image name given as customImageBuilderArgs */ if (explicitMainClass) { - imageBuilderArgs.add(oH(SubstrateOptions.Name, "main-class lower case as image name") + mainClass.toLowerCase(Locale.ENGLISH)); + imageBuilderArgs.add(oH(SubstrateOptions.Name, "main-class lower case as image name") + mainClass.toLowerCase(Locale.ROOT)); } else if (getHostedOptionArgumentValue(imageBuilderArgs, oHName) == null) { if (hasMainClassModule) { - imageBuilderArgs.add(oH(SubstrateOptions.Name, "image-name from module-name") + mainClassModule.toLowerCase(Locale.ENGLISH)); + imageBuilderArgs.add(oH(SubstrateOptions.Name, "image-name from module-name") + mainClassModule.toLowerCase(Locale.ROOT)); } else if (!listModules) { /* Although very unlikely, report missing image-name if needed. */ throw showError("Missing image-name. Use -o to provide one."); @@ -1447,7 +1447,7 @@ private void addTargetArguments() { if (targetPlatform == null) { return; } - targetPlatform = targetPlatform.toLowerCase(Locale.ENGLISH); + targetPlatform = targetPlatform.toLowerCase(Locale.ROOT); String[] parts = targetPlatform.split("-"); if (parts.length != 2) { @@ -1782,7 +1782,7 @@ private static void sanitizeJVMEnvironment(Map environment, Map< Function keyMapper; if (OS.WINDOWS.isCurrent()) { requiredKeys.addAll(List.of("TEMP", "INCLUDE", "LIB")); - keyMapper = s -> s.toUpperCase(Locale.ENGLISH); + keyMapper = s -> s.toUpperCase(Locale.ROOT); } else { keyMapper = Function.identity(); } @@ -2114,7 +2114,7 @@ public static List expandAsteriskClassPathElement(String cp) { } private static boolean hasJarFileSuffix(Path p) { - return p.getFileName().toString().toLowerCase(Locale.ENGLISH).endsWith(".jar"); + return p.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(".jar"); } /** diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java index 995c490e87c7..37909de8e1e3 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java @@ -419,7 +419,7 @@ public static Platform getTargetPlatform(ClassLoader classLoader) { String os = System.getProperty("svm.targetPlatformOS"); if (os == null) { - os = OS.getCurrent().className.toLowerCase(Locale.ENGLISH); + os = OS.getCurrent().className.toLowerCase(Locale.ROOT); } String arch = System.getProperty("svm.targetPlatformArch"); @@ -1714,7 +1714,7 @@ public static void checkName(String name, AnalysisMethod method, BigBang bb) { } public static String checkName(String name) { - String lname = name.toLowerCase(Locale.ENGLISH); + String lname = name.toLowerCase(Locale.ROOT); String message = null; if (lname.contains("hosted")) { message = "Hosted element used at run time: " + name; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java index 18cae931a57a..f4f825f1d7dc 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java @@ -211,7 +211,7 @@ public void printStart(String imageName, NativeImageKind imageKind) { } l().printHeadlineSeparator(); recordJsonMetric(GeneralInfo.IMAGE_NAME, imageName); - String imageKindName = imageKind.name().toLowerCase(Locale.ENGLISH).replace('_', ' '); + String imageKindName = imageKind.name().toLowerCase(Locale.ROOT).replace('_', ' '); l().blueBold().link("GraalVM Native Image", "https://www.graalvm.org/native-image/").reset() .a(": Generating '").bold().a(imageName).reset().a("' (").doclink(imageKindName, "#glossary-imagekind").a(")...").println(); l().printHeadlineSeparator(); @@ -682,7 +682,7 @@ private void printRecommendations() { l().yellowBold().a("Recommendations:").reset().println(); for (UserRecommendation r : topApplicableRecommendations) { String alignment = Utils.stringFilledWith(Math.max(1, 5 - r.id().length()), " "); - l().a(" ").doclink(r.id(), "#recommendation-" + r.id().toLowerCase(Locale.ENGLISH)).a(":").a(alignment).a(r.description()).println(); + l().a(" ").doclink(r.id(), "#recommendation-" + r.id().toLowerCase(Locale.ROOT)).a(":").a(alignment).a(r.description()).println(); } } @@ -784,7 +784,7 @@ private void printArtifacts(Map> artifacts) { Map> pathToTypes = new TreeMap<>(); artifacts.forEach((artifactType, paths) -> { for (Path path : paths) { - pathToTypes.computeIfAbsent(path, p -> new ArrayList<>()).add(artifactType.name().toLowerCase(Locale.ENGLISH)); + pathToTypes.computeIfAbsent(path, p -> new ArrayList<>()).add(artifactType.name().toLowerCase(Locale.ROOT)); } }); pathToTypes.forEach((path, typeNames) -> l().a(" ").link(path).dim().a(" (").a(String.join(", ", typeNames)).a(")").reset().println()); @@ -1185,7 +1185,7 @@ public void run() { private void appendStageStart() { a(outputPrefix).blue().a(String.format("[%s/%s] ", 1 + activeBuildStage.ordinal(), BuildStage.NUM_STAGES)).reset() - .blueBold().doclink(activeBuildStage.message, "#stage-" + activeBuildStage.name().toLowerCase(Locale.ENGLISH)).a("...").reset(); + .blueBold().doclink(activeBuildStage.message, "#stage-" + activeBuildStage.name().toLowerCase(Locale.ROOT)).a("...").reset(); } final String progressBarStartPadding() { diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporterFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporterFeature.java index 8f7720d92d84..20a8c3b3165a 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporterFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporterFeature.java @@ -138,7 +138,7 @@ private static boolean recommendTraceAgentForAWT() { public record UserRecommendation(String id, String description, Supplier isApplicable) { public UserRecommendation { - assert id.toUpperCase(Locale.ENGLISH).equals(id) && id.length() < 5 : "id must be uppercase and have fewer than 5 chars"; + assert id.toUpperCase(Locale.ROOT).equals(id) && id.length() < 5 : "id must be uppercase and have fewer than 5 chars"; int maxLength = 74; assert description.length() < maxLength : "description must have fewer than " + maxLength + " chars to fit in terminal. Length: " + description.length(); } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/VMFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/VMFeature.java index 0975c51943b2..38d9d0ca92c0 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/VMFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/VMFeature.java @@ -121,7 +121,7 @@ public void afterAnalysis(AfterAnalysisAccess access) { private static void addCGlobalDataString(String infoType, String content) { String data = VM.class.getName() + "." + infoType + valueSeparator + content; - String symbolName = "__svm_vm_" + infoType.toLowerCase(Locale.ENGLISH).replace(".", "_"); + String symbolName = "__svm_vm_" + infoType.toLowerCase(Locale.ROOT).replace(".", "_"); CGlobalDataFeature.singleton().registerWithGlobalSymbol(CGlobalDataFactory.createCString(data, symbolName)); } } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java index 1a92a07efc95..780c8ec3b54b 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java @@ -295,7 +295,7 @@ private static Path getPlatformDependentJDKStaticLibraryPath() throws IOExceptio Path baseSearchPath = Paths.get(System.getProperty("java.home")).resolve("lib").toRealPath(); Path staticLibPath = baseSearchPath.resolve("static"); Platform platform = ImageSingletons.lookup(Platform.class); - Path platformDependentPath = staticLibPath.resolve((platform.getOS() + "-" + platform.getArchitecture()).toLowerCase(Locale.ENGLISH)); + Path platformDependentPath = staticLibPath.resolve((platform.getOS() + "-" + platform.getArchitecture()).toLowerCase(Locale.ROOT)); if (HostedLibCBase.isPlatformEquivalent(Platform.LINUX.class)) { platformDependentPath = platformDependentPath.resolve(HostedLibCBase.singleton().getName()); if (HostedLibCBase.singleton().requiresLibCSpecificStaticJDKLibraries()) { diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedLibCBase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedLibCBase.java index eb0abc733c56..e5dc233fb007 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedLibCBase.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedLibCBase.java @@ -66,7 +66,7 @@ static boolean isPlatformEquivalent(Class platformClass) { // Checkstyle: allow Class.getSimpleName String simpleName = platformClass.getSimpleName(); // Checkstyle: disallow Class.getSimpleName - return simpleName.toLowerCase(Locale.ENGLISH).equals(platform.getOS()) || Platform.includedIn(platformClass); + return simpleName.toLowerCase(Locale.ROOT).equals(platform.getOS()) || Platform.includedIn(platformClass); } /** diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationOptions.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationOptions.java index 643a8bfc041d..45cc0fb82f4b 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationOptions.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationOptions.java @@ -65,19 +65,19 @@ public Object apply(Object o) { private static class InitializationValueDelay extends InitializationValueTransformer { InitializationValueDelay() { - super(RUN_TIME.name().toLowerCase(Locale.ENGLISH)); + super(RUN_TIME.name().toLowerCase(Locale.ROOT)); } } private static class InitializationValueRerun extends InitializationValueTransformer { InitializationValueRerun() { - super(RERUN.name().toLowerCase(Locale.ENGLISH)); + super(RERUN.name().toLowerCase(Locale.ROOT)); } } private static class InitializationValueEager extends InitializationValueTransformer { InitializationValueEager() { - super(BUILD_TIME.name().toLowerCase(Locale.ENGLISH)); + super(BUILD_TIME.name().toLowerCase(Locale.ROOT)); } } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/InitKind.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/InitKind.java index 8c82cd0f4507..6aa8f33a8d36 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/InitKind.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/InitKind.java @@ -63,7 +63,7 @@ boolean isRunTime() { public static final String SEPARATOR = ":"; String suffix() { - return SEPARATOR + name().toLowerCase(Locale.ENGLISH); + return SEPARATOR + name().toLowerCase(Locale.ROOT); } Consumer stringConsumer(ClassInitializationSupport support, OptionOrigin origin) { diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisToHostedGraphTransplanter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisToHostedGraphTransplanter.java index d2e91c35cf68..6e927794baef 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisToHostedGraphTransplanter.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisToHostedGraphTransplanter.java @@ -342,8 +342,8 @@ static Object replaceAnalysisObjects(Object obj, Node node, IdentityHashMap methods, boolean dynamic) { CSourceCodeWriter writer = new CSourceCodeWriter(outDir); - String imageHeaderGuard = "__" + header.name().toUpperCase(Locale.ENGLISH).replaceAll("[^A-Z0-9]", "_") + "_H"; + String imageHeaderGuard = "__" + header.name().toUpperCase(Locale.ROOT).replaceAll("[^A-Z0-9]", "_") + "_H"; String dynamicSuffix = dynamic ? "_dynamic.h" : ".h"; writer.appendln("#ifndef " + imageHeaderGuard); diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java index 0980e981042f..579688abeae5 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java @@ -419,9 +419,9 @@ private void addCharsets() { @Platforms(Platform.HOSTED_ONLY.class) public static void addCharset(Charset charset) { Map charsets = ImageSingletons.lookup(LocalizationSupport.class).charsets; - charsets.put(charset.name().toLowerCase(Locale.ENGLISH), charset); + charsets.put(charset.name().toLowerCase(Locale.ROOT), charset); for (String name : charset.aliases()) { - charsets.put(name.toLowerCase(Locale.ENGLISH), charset); + charsets.put(name.toLowerCase(Locale.ROOT), charset); } /* Eagerly initialize all the tables necessary for decoding / encoding. */ diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java index e2d98c683652..103f11f9cf0f 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java @@ -313,7 +313,7 @@ private static String valueConverterName(Wrapper src, Wrapper dest) { String srcType = src.primitiveSimpleName(); String destType = dest.primitiveSimpleName(); /* Capitalize first letter of destination type */ - return srcType + "To" + destType.substring(0, 1).toUpperCase(Locale.ENGLISH) + destType.substring(1); + return srcType + "To" + destType.substring(0, 1).toUpperCase(Locale.ROOT) + destType.substring(1); } private static void registerValueConversionIgnoreForReflection(DuringAnalysisAccess access) {