Comparing analysis methods and types.

Author: Maja Skoko

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java

@@ -1003,4 +1003,18 @@ public boolean getReturnsAllInstantiatedTypes() {
     protected abstract AnalysisMethod createMultiMethod(AnalysisMethod analysisMethod, MultiMethodKey newMultiMethodKey);
 
     public abstract boolean isImplementationInvokable();
+
+    /**
+     *
+     * Lambda function names are still not completely deterministic e.g. in name
+     * Lambda$7ad16f47b695d909/0x00000007c0b4c630.accept(java.lang.Object):void hash part is not
+     * deterministic yet. In order to avoid comparing based on that part, we need to eliminate hash
+     * part from name of lambda function. To read more about Lambda names check GH issue
+     * https://github.com/openjdk/jdk/pull/10024/.
+     *
+     */
+    public static String comparableMethodSignature(AnalysisMethod method) {
+        String signature = method.format("%H.%n(%P):%R");
+        return signature.contains("$$Lambda") ? signature.replaceAll("/[0-9a-fA-Fx]*\\.", ".") : signature;
+    }
 }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java

@@ -870,6 +870,16 @@ public final String getName() {
         return wrapped.getName();
     }
 
+    public final String getComparableName() {
+        /*
+         * Avoiding non-deterministic hash part of lambda names. Example of such class name e.g.
+         * Ljava/util/Spliterator$OfDouble$$Lambda$d28f9317da054138.0x00000007c1a64860; For more
+         * about Lambda names check GH issue https://github.com/openjdk/jdk/pull/10024/.
+         */
+        String name = getName();
+        return name.contains("$$Lambda") ? name.replaceAll("\\.0x[0-9a-fA-Fx]*", "") : name;
+    }
+
     @Override
     public String toJavaName() {
         return qualifiedName;

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ReportUtils.java

@@ -61,7 +61,7 @@ public class ReportUtils {
     public static final Comparator<ResolvedJavaMethod> methodComparator = Comparator.comparing(m -> m.format("%H.%n(%P):%R"));
     static final Comparator<AnalysisField> fieldComparator = Comparator.comparing(f -> f.format("%H.%n"));
     static final Comparator<InvokeInfo> invokeInfoBCIComparator = Comparator.comparing(i -> i.getPosition().getBCI());
-    static final Comparator<InvokeInfo> invokeInfoComparator = invokeInfoBCIComparator.thenComparing(i -> comparingMethodNames(i.getTargetMethod()));
+    static final Comparator<InvokeInfo> invokeInfoComparator = invokeInfoBCIComparator.thenComparing(i -> AnalysisMethod.comparingMethodNames(i.getTargetMethod()));
     static final Comparator<BytecodePosition> positionMethodComparator = Comparator.comparing(pos -> pos.getMethod().format("%H.%n(%P):%R"));
     static final Comparator<BytecodePosition> positionComparator = positionMethodComparator.thenComparing(pos -> pos.getBCI());
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java

@@ -167,7 +167,7 @@ public Pair<HostedMethod, CompilationResult> getLastCompilation() {
     }
 
     protected static Comparator<Pair<HostedMethod, CompilationResult>> compilationsComparator() {
-        Comparator<Pair<HostedMethod, CompilationResult>> nameComparator = Comparator.comparing(o -> AnalysisMethod.comparingMethodNames(o.getLeft().wrapped));
+        Comparator<Pair<HostedMethod, CompilationResult>> nameComparator = Comparator.comparing(o -> AnalysisMethod.comparableMethodSignature(o.getLeft().wrapped));
         return nameComparator.thenComparing(o -> o.getRight().getTargetCodeSize());
     }