[GR-52534] Change digest algorithm and encoding.

PullRequest: graal/17205

Author: Christian Wimmer

compiler/mx.compiler/suite.py

@@ -512,6 +512,7 @@
                   org.graalvm.truffle.runtime.svm,
                   com.oracle.truffle.enterprise.svm""",
           "jdk.graal.compiler.java                   to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
+          "jdk.graal.compiler.util                   to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
           "jdk.graal.compiler.core.common            to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile",
           "jdk.graal.compiler.debug                  to org.graalvm.nativeimage.objectfile",
           "jdk.graal.compiler.nodes.graphbuilderconf to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport",

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LambdaStableNameTest.java

@@ -75,7 +75,7 @@ public void checkStableLamdaNameForRunnableAndAutoCloseable() {
         assertEquals("Both stable lambda names are the same as they reference the same method", name, acName);
 
         String myName = Type.getInternalName(getClass());
-        assertEquals("The name known in 24.0 version is computed", "L" + myName + "$$Lambda.0xed5a4b9e70b8402e1deaafe82331c67282b84ba0;", name);
+        assertEquals("The name known in 24.0 version is computed", "L" + myName + "$$Lambda.0x605511206480068bfd9e0bafd4f79e22;", name);
     }
 
     private static void assertLambdaName(String name) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LambdaUtils.java

@@ -24,9 +24,6 @@
  */
 package jdk.graal.compiler.java;
 
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
@@ -46,14 +43,14 @@
 import jdk.graal.compiler.phases.OptimisticOptimizations;
 import jdk.graal.compiler.phases.tiers.HighTierContext;
 import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.util.Digest;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 public final class LambdaUtils {
 
     private static final Pattern LAMBDA_PATTERN = Pattern.compile("\\$\\$Lambda[/.][^/]+;");
-    private static final char[] HEX = "0123456789abcdef".toCharArray();
     public static final String LAMBDA_SPLIT_PATTERN = "\\$\\$Lambda";
     public static final String LAMBDA_CLASS_NAME_SUBSTRING = "$$Lambda";
     public static final String SERIALIZATION_TEST_LAMBDA_CLASS_SUBSTRING = "$$Lambda";
@@ -152,48 +149,13 @@ private static String createStableLambdaName(ResolvedJavaType lambdaType, List<R
         for (ResolvedJavaMethod ctor : lambdaType.getDeclaredConstructors()) {
             sb.append(ctor.format("%P"));
         }
-        return m.replaceFirst(Matcher.quoteReplacement(LAMBDA_CLASS_NAME_SUBSTRING + ADDRESS_PREFIX + digest(sb.toString()) + ";"));
+        return m.replaceFirst(Matcher.quoteReplacement(LAMBDA_CLASS_NAME_SUBSTRING + ADDRESS_PREFIX + Digest.digestAsHex(sb.toString()) + ";"));
     }
 
     private static Matcher lambdaMatcher(String value) {
         return LAMBDA_PATTERN.matcher(value);
     }
 
-    public static String toHex(byte[] data) {
-        StringBuilder r = new StringBuilder(data.length * 2);
-        for (byte b : data) {
-            r.append(HEX[(b >> 4) & 0xf]);
-            r.append(HEX[b & 0xf]);
-        }
-        return r.toString();
-    }
-
-    /**
-     * Hashing a passed string parameter using SHA-1 hashing algorithm.
-     *
-     * @param value string to be hashed
-     * @return hexadecimal hashed value of the passed string parameter
-     */
-    public static String digest(String value) {
-        return digest(value.getBytes(StandardCharsets.UTF_8));
-    }
-
-    /**
-     * Hashing a passed byte array parameter using SHA-1 hashing algorithm.
-     *
-     * @param bytes byte array to be hashed
-     * @return hexadecimal hashed value of the passed byte array parameter
-     */
-    public static String digest(byte[] bytes) {
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-1");
-            md.update(bytes);
-            return toHex(md.digest());
-        } catch (NoSuchAlgorithmException ex) {
-            throw new JVMCIError(ex);
-        }
-    }
-
     /**
      * Extracts lambda capturing class name from the lambda class name.
      *

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/StableMethodNameFormatter.java

@@ -24,8 +24,6 @@
  */
 package jdk.graal.compiler.java;
 
-import static jdk.graal.compiler.java.LambdaUtils.digest;
-
 import java.util.List;
 import java.util.function.Function;
 import java.util.regex.Matcher;
@@ -44,6 +42,7 @@
 import jdk.graal.compiler.phases.OptimisticOptimizations;
 import jdk.graal.compiler.phases.tiers.HighTierContext;
 import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.util.Digest;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
@@ -86,7 +85,7 @@ public class StableMethodNameFormatter implements Function<ResolvedJavaMethod, S
 
     /**
      * The format of the invoked methods passed to {@link ResolvedJavaMethod#format(String)}, which
-     * is {@link LambdaUtils#digest hashed} later.
+     * is {@link Digest#digest hashed} later.
      */
     private static final String INVOKED_METHOD_FORMAT = "%H.%n(%P)%R";
 
@@ -183,7 +182,7 @@ private String findStableMHName(ResolvedJavaMethod method) {
         Matcher matcher = MH_METHOD_PATTERN.matcher(lambdaName);
         StringBuilder sb = new StringBuilder();
         invokedMethods.forEach((targetMethod) -> sb.append(targetMethod.format(INVOKED_METHOD_FORMAT)));
-        return matcher.replaceFirst(Matcher.quoteReplacement(MH_PREFIX + digest(sb.toString())));
+        return matcher.replaceFirst(Matcher.quoteReplacement(MH_PREFIX + Digest.digest(sb.toString())));
     }
 
     /**
@@ -207,6 +206,6 @@ private String findStableLambdaMethodName(ResolvedJavaMethod method) {
         Matcher matcher = LAMBDA_METHOD_PATTERN.matcher(lambdaName);
         StringBuilder sb = new StringBuilder();
         invokedMethods.forEach((targetMethod) -> sb.append(targetMethod.format(INVOKED_METHOD_FORMAT)));
-        return matcher.replaceFirst(Matcher.quoteReplacement(LAMBDA_PREFIX + digest(sb.toString())));
+        return matcher.replaceFirst(Matcher.quoteReplacement(LAMBDA_PREFIX + Digest.digest(sb.toString())));
     }
 }