[GR-70786] Fix style issues in Native Image source code

PullRequest: graal/22385

Author: zapster

compiler/mx.compiler/suite.py

@@ -574,7 +574,7 @@
           "jdk.graal.compiler.nodes.graphbuilderconf to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport",
           "jdk.graal.compiler.options                to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport",
           "jdk.graal.compiler.phases.common          to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
-          "jdk.graal.compiler.serviceprovider        to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics",
+          "jdk.graal.compiler.serviceprovider        to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics,org.graalvm.nativeimage.objectfile",
           "jdk.graal.compiler.util.json              to org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.driver",
         ],
         "uses" : [

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CheckGraalInvariants.java

@@ -154,11 +154,6 @@ public static void main(String[] args) {
 
     }
 
-    public static String relativeFileName(String absolutePath) {
-        int lastFileSeparatorIndex = absolutePath.lastIndexOf(File.separator);
-        return absolutePath.substring(Math.max(lastFileSeparatorIndex, 0));
-    }
-
     public static class InvariantsTool {
 
         protected boolean shouldProcess(String classpathEntry) {

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyAArch64RegisterUsages.java

@@ -24,6 +24,9 @@
  */
 package jdk.graal.compiler.core.test;
 
+import java.util.Arrays;
+import java.util.List;
+
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.java.LoadFieldNode;
 import jdk.graal.compiler.nodes.spi.CoreProviders;
@@ -35,9 +38,6 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Verify that scratch registers are not used in AArch64 specific code. We use a different set for
  * HotSpot (r8/r9) and SubstrateVM (r9/r10).
@@ -63,6 +63,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
             case "jdk.graal.compiler.hotspot.aarch64.AArch64HotSpotBackend.emitCodePrefix":
             case "com.oracle.svm.core.aarch64.SubstrateAArch64MacroAssembler.<clinit>":
             case "com.oracle.svm.core.graal.aarch64.SubstrateAArch64RegisterConfig.getCallingConvention":
+            case "com.oracle.objectfile.elf.dwarf.DwarfLocSectionImpl$DwarfRegEncodingAArch64.<clinit>":
                 // Exempted cases
                 return;
             default:
@@ -80,7 +81,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
 
             if (potentialScratchRegisters.contains(f.getName())) {
                 throw new VerificationError("Access to %s register at callsite %s is prohibited.",
-                                f, method.format("%H.%n(%p)"), f);
+                                f.format("%H.%n"), method.format("%H.%n(%p)"), f);
             }
         }
     }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java

@@ -52,6 +52,7 @@
 import com.oracle.objectfile.pecoff.PECoffObjectFile;
 
 import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 import sun.nio.ch.DirectBuffer;
 
 /**
@@ -172,7 +173,7 @@ public static <E extends Enum<E> & ValueEnum> EnumSet<E> flagSetFromLong(long fl
     // FIXME: replace OS string with enum (or just get rid of the concept,
     // perhaps merging with getFilenameSuffix).
     private static String getHostOS() {
-        final String osName = System.getProperty("os.name");
+        final String osName = GraalServices.getSavedProperty("os.name");
         if (osName.startsWith("Linux")) {
             return "Linux";
         } else if (osName.startsWith("Mac OS X")) {

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java

@@ -25,11 +25,13 @@
 
 package com.oracle.objectfile.elf;
 
+import java.util.Locale;
+
 import com.oracle.objectfile.ObjectFile.RelocationKind;
 import com.oracle.objectfile.ObjectFile.RelocationMethod;
 import com.oracle.objectfile.elf.ELFRelocationSection.ELFRelocationMethod;
 
-import java.util.Locale;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 /**
  * ELF machine type (incomplete). Each machine type also defines its set of relocation types.
@@ -209,7 +211,7 @@ public short toShort() {
     }
 
     public static ELFMachine getSystemNativeValue() {
-        String arch = System.getProperty("os.arch");
+        String arch = GraalServices.getSavedProperty("os.arch");
         return switch (arch) {
             case "aarch64", "arm64" -> AArch64;
             case "amd64", "x86_64" -> X86_64;

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffHeaderStruct.java

@@ -29,14 +29,16 @@
 
 import com.oracle.objectfile.pecoff.PECoff.IMAGE_FILE_HEADER;
 
+import jdk.graal.compiler.serviceprovider.GraalServices;
+
 public class PECoffHeaderStruct {
     private final ByteBuffer header;
 
     public PECoffHeaderStruct() {
         header = PECoffByteBuffer.allocate(IMAGE_FILE_HEADER.totalsize);
 
         header.putChar(IMAGE_FILE_HEADER.Machine.off, IMAGE_FILE_HEADER.IMAGE_FILE_MACHINE_AMD64);
-        header.putInt(IMAGE_FILE_HEADER.TimeDateStamp.off, (int) (System.currentTimeMillis() / 1000));
+        header.putInt(IMAGE_FILE_HEADER.TimeDateStamp.off, (int) (GraalServices.milliTimeStamp() / 1000));
         header.putInt(IMAGE_FILE_HEADER.PointerToSymbolTable.off, 0);
         header.putInt(IMAGE_FILE_HEADER.NumberOfSymbols.off, 0);
         header.putChar(IMAGE_FILE_HEADER.SizeOfOptionalHeader.off, (char) 0);

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffMachine.java

@@ -31,6 +31,8 @@
 import com.oracle.objectfile.pecoff.PECoff.IMAGE_RELOCATION;
 import com.oracle.objectfile.pecoff.PECoffRelocationTable.PECoffRelocationMethod;
 
+import jdk.graal.compiler.serviceprovider.GraalServices;
+
 /**
  * PECoff machine type (incomplete). Each machine type also defines its set of relocation types.
  */
@@ -87,7 +89,7 @@ public short toShort() {
     }
 
     public static PECoffMachine getSystemNativeValue() {
-        String arch = System.getProperty("os.arch");
+        String arch = GraalServices.getSavedProperty("os.arch");
         return switch (arch) {
             case "amd64", "x86_64" -> X86_64;
             default -> throw new IllegalArgumentException("Unsupported PECoff machine type: " + arch);

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSubrecord.java

@@ -26,11 +26,13 @@
 
 package com.oracle.objectfile.pecoff.cv;
 
-import com.oracle.objectfile.debugentry.ClassEntry;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import com.oracle.objectfile.debugentry.ClassEntry;
+
+import jdk.graal.compiler.serviceprovider.GraalServices;
+
 /*
  * A CVSymbolSubrecord is a record in a DEBUG_S_SYMBOL record within a .debug$S section within a PECOFF file.
  */
@@ -198,7 +200,7 @@ public static final class CVEnvBlockRecord extends CVSymbolSubrecord {
             super(cvDebugInfo, CVDebugConstants.S_ENVBLOCK);
 
             /* Current directory. */
-            map.put("cwd", System.getProperty("user.dir"));
+            map.put("cwd", GraalServices.getSystemProperties("user.dir is not available via GraalServices.getSavedProperties()").getProperty("user.dir"));
 
             /*
              * Define the primary source file - ideally, the source file containing main(). (Note

substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupport.java

@@ -27,6 +27,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -141,7 +142,7 @@ public static void accessPackagesToClass(Access access, Class<?> accessingClass,
                 return;
             }
             String accessor = accessingClass != null ? "class " + accessingClass.getTypeName() : "ALL-UNNAMED";
-            String message = access.name().toLowerCase() + " of packages from module " + moduleName + " to " +
+            String message = access.name().toLowerCase(Locale.ROOT) + " of packages from module " + moduleName + " to " +
                             accessor + " failed. No module named " + moduleName + " in boot layer.";
             throw new ModuleSupportError(message);
         }