Move SIMPLE_DATE_FORMAT out of class that defines options

Author: olpaw

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/LibGraalSubstitutions.java

@@ -33,8 +33,8 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
-import jdk.graal.compiler.debug.DebugOptions;
 import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.PathUtilities;
 
 class LibGraalSubstitutions {
 
@@ -143,7 +143,7 @@ static final class Target_java_text_DateFormatSymbols {
          */
         @Substitute
         public static DateFormatSymbols getInstance(Locale unused) {
-            return DebugOptions.getSharedDateFormatSymbols();
+            return PathUtilities.getSharedDateFormatSymbols();
         }
     }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugOptions.java

@@ -27,11 +27,10 @@
 import static jdk.graal.compiler.debug.PathUtilities.createDirectories;
 import static jdk.graal.compiler.debug.PathUtilities.exists;
 import static jdk.graal.compiler.debug.PathUtilities.getAbsolutePath;
+import static jdk.graal.compiler.debug.PathUtilities.getDateString;
 import static jdk.graal.compiler.debug.PathUtilities.getPath;
 
 import java.io.IOException;
-import java.text.DateFormatSymbols;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import jdk.graal.compiler.options.EnumMultiOptionKey;
@@ -325,21 +324,6 @@ public static String getDumpDirectory(OptionValues options) throws IOException {
         return dumpDir;
     }
 
-    /**
-     * This circumvents instantiating {@link SimpleDateFormat} at libgraal runtime. This is needed
-     * to avoid String-based class-lookup (to find resource bundle
-     * {@code sun.text.resources.cldr.FormatData} as part of {@link SimpleDateFormat} construction)
-     * and allows us to avoid class-lookup support in the image.
-     */
-    private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss.SSS");
-
-    public static DateFormatSymbols getSharedDateFormatSymbols() {
-        // SimpleDateFormat is not thread-safe
-        synchronized (SIMPLE_DATE_FORMAT) {
-            return SIMPLE_DATE_FORMAT.getDateFormatSymbols();
-        }
-    }
-
     /**
      * Returns the {@link #getDumpDirectory} without attempting to create it.
      */
@@ -349,12 +333,7 @@ public static String getDumpDirectoryName(OptionValues options) {
             dumpDir = getPath(DumpPath.getValue(options));
         } else {
             Date date = new Date(GraalServices.getGlobalTimeStamp());
-            String dateString;
-            // SimpleDateFormat is not thread-safe
-            synchronized (SIMPLE_DATE_FORMAT) {
-                dateString = SIMPLE_DATE_FORMAT.format(date);
-            }
-            dumpDir = getPath(DumpPath.getValue(options), dateString);
+            dumpDir = getPath(DumpPath.getValue(options), getDateString(date));
         }
         dumpDir = getAbsolutePath(dumpDir);
         return dumpDir;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/PathUtilities.java

@@ -34,6 +34,9 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.OpenOption;
 import java.nio.file.Path;
+import java.text.DateFormatSymbols;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
@@ -85,6 +88,28 @@ public static String getPath(String first, String... more) {
         return PROVIDER.getPath(first, more);
     }
 
+    /**
+     * This circumvents instantiating {@link SimpleDateFormat} at libgraal runtime. This is needed
+     * to avoid String-based class-lookup (to find resource bundle
+     * {@code sun.text.resources.cldr.FormatData} as part of {@link SimpleDateFormat} construction)
+     * and allows us to avoid class-lookup support in the image.
+     */
+    private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss.SSS");
+
+    public static DateFormatSymbols getSharedDateFormatSymbols() {
+        // SimpleDateFormat is not thread-safe
+        synchronized (SIMPLE_DATE_FORMAT) {
+            return SIMPLE_DATE_FORMAT.getDateFormatSymbols();
+        }
+    }
+
+    public static String getDateString(Date date) {
+        // SimpleDateFormat is not thread-safe
+        synchronized (SIMPLE_DATE_FORMAT) {
+            return SIMPLE_DATE_FORMAT.format(date);
+        }
+    }
+
     /**
      * Gets the absolute pathname of {@code path}.
      */