Skip to content

Commit

Permalink
Call String::to{Upper,Lower}Case with Locale.ENGLISH in SVM code base
Browse files Browse the repository at this point in the history
  • Loading branch information
fniephaus committed Jan 29, 2024
1 parent dd7b6d5 commit ae9da7d
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import static org.graalvm.nativeimage.c.function.CFunction.Transition.NO_TRANSITION;

import java.util.Hashtable;
import java.util.Locale;

import org.graalvm.nativeimage.c.function.CFunction;
import org.graalvm.word.WordFactory;
Expand Down Expand Up @@ -117,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());
Integer.toUnsignedString(WinBase.GetLastError(), 16).toUpperCase(Locale.ENGLISH));
}
RuntimeSupport.getRuntimeSupport().addTearDownHook(isFirstIsolate -> osTerminateSignalThread());
signalDispatcherThread.start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@

import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.function.Supplier;

import jdk.graal.compiler.api.replacements.Fold;
import org.graalvm.nativeimage.ImageInfo;
import org.graalvm.nativeimage.ImageSingletons;
import org.graalvm.nativeimage.Platform;
Expand All @@ -41,6 +41,8 @@
import com.oracle.svm.core.config.ConfigurationValues;
import com.oracle.svm.core.util.VMError;

import jdk.graal.compiler.api.replacements.Fold;

/**
* This class maintains the system properties at run time.
*
Expand Down Expand Up @@ -117,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()) : "java.vm.info should not contain uppercase characters";
assert vm.info.equals(vm.info.toLowerCase(Locale.ENGLISH)) : "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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() + (selection.wildcard ? "*" : "") + " for FlightRecorderLogging");
selection.tags.toString().toLowerCase(Locale.ENGLISH) + (selection.wildcard ? "*" : "") + " for FlightRecorderLogging");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -115,7 +116,7 @@ public Stream<Pair<T, OptionOrigin>> getValuesWithOrigins() {

@Override
public String toString() {
return "<" + ClassUtil.getUnqualifiedName(valueType).toLowerCase() + ">*";
return "<" + ClassUtil.getUnqualifiedName(valueType).toLowerCase(Locale.ENGLISH) + ">*";
}

public static final class Strings extends LocatableMultiOptionValue<String> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import jdk.graal.compiler.options.OptionKey;

import com.oracle.svm.core.SubstrateUtil;
import com.oracle.svm.core.util.UserError;

import jdk.graal.compiler.options.OptionKey;

/**
* This class contains static helper methods related to options.
*/
Expand Down Expand Up @@ -110,7 +111,7 @@ public String getDescriptionPrefix(boolean commandLineStyle) {

@Override
public String toString() {
return name().toLowerCase();
return name().toLowerCase(Locale.ENGLISH);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public class NativeImage {
static final String platform = getPlatform();

private static String getPlatform() {
return (OS.getCurrent().className + "-" + SubstrateUtil.getArchitectureName()).toLowerCase();
return (OS.getCurrent().className + "-" + SubstrateUtil.getArchitectureName()).toLowerCase(Locale.ENGLISH);
}

static final String graalvmVendor = VM.getVendor();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
Expand Down Expand Up @@ -210,7 +211,7 @@ public void printStart(String imageName, NativeImageKind imageKind) {
}
l().printHeadlineSeparator();
recordJsonMetric(GeneralInfo.IMAGE_NAME, imageName);
String imageKindName = imageKind.name().toLowerCase().replace('_', ' ');
String imageKindName = imageKind.name().toLowerCase(Locale.ENGLISH).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();
Expand Down Expand Up @@ -681,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()).a(":").a(alignment).a(r.description()).println();
l().a(" ").doclink(r.id(), "#recommendation-" + r.id().toLowerCase(Locale.ENGLISH)).a(":").a(alignment).a(r.description()).println();
}
}

Expand Down Expand Up @@ -783,7 +784,7 @@ private void printArtifacts(Map<ArtifactType, List<Path>> artifacts) {
Map<Path, List<String>> pathToTypes = new TreeMap<>();
artifacts.forEach((artifactType, paths) -> {
for (Path path : paths) {
pathToTypes.computeIfAbsent(path, p -> new ArrayList<>()).add(artifactType.name().toLowerCase());
pathToTypes.computeIfAbsent(path, p -> new ArrayList<>()).add(artifactType.name().toLowerCase(Locale.ENGLISH));
}
});
pathToTypes.forEach((path, typeNames) -> l().a(" ").link(path).dim().a(" (").a(String.join(", ", typeNames)).a(")").reset().println());
Expand Down Expand Up @@ -1184,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()).a("...").reset();
.blueBold().doclink(activeBuildStage.message, "#stage-" + activeBuildStage.name().toLowerCase(Locale.ENGLISH)).a("...").reset();
}

final String progressBarStartPadding() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
package com.oracle.svm.hosted;

import java.util.List;
import java.util.Locale;
import java.util.function.Supplier;

import org.graalvm.nativeimage.ImageSingletons;
Expand Down Expand Up @@ -137,7 +138,7 @@ private static boolean recommendTraceAgentForAWT() {

public record UserRecommendation(String id, String description, Supplier<Boolean> isApplicable) {
public UserRecommendation {
assert id.toUpperCase().equals(id) && id.length() < 5 : "id must be uppercase and have fewer than 5 chars";
assert id.toUpperCase(Locale.ENGLISH).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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,25 @@
import java.util.Arrays;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;

import com.oracle.graal.pointsto.heap.ImageHeapConstant;
import com.oracle.graal.pointsto.meta.AnalysisField;
import com.oracle.graal.pointsto.meta.AnalysisMethod;
import com.oracle.graal.pointsto.meta.AnalysisType;
import com.oracle.svm.common.meta.MultiMethod;
import com.oracle.svm.core.graal.nodes.ComputedIndirectCallTargetNode;
import com.oracle.svm.core.graal.nodes.SubstrateFieldLocationIdentity;
import com.oracle.svm.core.graal.nodes.SubstrateNarrowOopStamp;
import com.oracle.svm.core.meta.MethodPointer;
import com.oracle.svm.core.meta.SubstrateMethodPointerConstant;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.hosted.meta.HostedField;
import com.oracle.svm.hosted.meta.HostedMethod;
import com.oracle.svm.hosted.meta.HostedType;
import com.oracle.svm.hosted.meta.HostedUniverse;

import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode;
import jdk.graal.compiler.core.common.Fields;
import jdk.graal.compiler.core.common.GraalOptions;
Expand All @@ -51,23 +68,6 @@
import jdk.graal.compiler.nodes.virtual.VirtualObjectState;
import jdk.graal.compiler.options.OptionValues;
import jdk.graal.compiler.replacements.SnippetTemplate;

import com.oracle.graal.pointsto.heap.ImageHeapConstant;
import com.oracle.graal.pointsto.meta.AnalysisField;
import com.oracle.graal.pointsto.meta.AnalysisMethod;
import com.oracle.graal.pointsto.meta.AnalysisType;
import com.oracle.svm.common.meta.MultiMethod;
import com.oracle.svm.core.graal.nodes.ComputedIndirectCallTargetNode;
import com.oracle.svm.core.graal.nodes.SubstrateFieldLocationIdentity;
import com.oracle.svm.core.graal.nodes.SubstrateNarrowOopStamp;
import com.oracle.svm.core.meta.MethodPointer;
import com.oracle.svm.core.meta.SubstrateMethodPointerConstant;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.hosted.meta.HostedField;
import com.oracle.svm.hosted.meta.HostedMethod;
import com.oracle.svm.hosted.meta.HostedType;
import com.oracle.svm.hosted.meta.HostedUniverse;

import jdk.vm.ci.code.BytecodePosition;
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
Expand Down Expand Up @@ -342,8 +342,8 @@ static Object replaceAnalysisObjects(Object obj, Node node, IdentityHashMap<Obje
newReplacement = obj;
} else {
/* Check that we do not have a class or package name that relates to the analysis. */
assert !obj.getClass().getName().toLowerCase().contains("analysis") : "Object " + obj + " of " + obj.getClass() + " in node " + node;
assert !obj.getClass().getName().toLowerCase().contains("pointsto") : "Object " + obj + " of " + obj.getClass() + " in node " + node;
assert !obj.getClass().getName().toLowerCase(Locale.ENGLISH).contains("analysis") : "Object " + obj + " of " + obj.getClass() + " in node " + node;
assert !obj.getClass().getName().toLowerCase(Locale.ENGLISH).contains("pointsto") : "Object " + obj + " of " + obj.getClass() + " in node " + node;
newReplacement = obj;
}

Expand Down

0 comments on commit ae9da7d

Please sign in to comment.