Deterministic sort for compilations with non-unique name.

Maja Skoko · Maja Skoko · commit 97e4309369ea · 2023-08-10T11:41:07.000+02:00
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java
@@ -165,9 +165,13 @@ public Pair<HostedMethod, CompilationResult> getLastCompilation() {
         return orderedCompilations.get(orderedCompilations.size() - 1);
     }
 
+    protected static Comparator<Pair<HostedMethod, CompilationResult>> compilationsComparator() {
+        Comparator<Pair<HostedMethod, CompilationResult>> nameComparator = Comparator.comparing(o -> AnalysisMethod.comparingMethodNames(o.getLeft().wrapped));
+        return nameComparator.thenComparing(o -> o.getRight().getTargetCodeSize());
+    }
+
     protected List<Pair<HostedMethod, CompilationResult>> computeCompilationOrder(Map<HostedMethod, CompilationResult> compilationMap) {
-        return compilationMap.entrySet().stream().map(e -> Pair.create(e.getKey(), e.getValue())).sorted(Comparator.comparing(o -> o.getLeft().wrapped.format("%H.%n(%P):%R")))
-                        .collect(Collectors.toList());
+        return compilationMap.entrySet().stream().map(e -> Pair.create(e.getKey(), e.getValue())).sorted(compilationsComparator()).collect(Collectors.toList());
     }
 
     public List<Pair<HostedMethod, CompilationResult>> getOrderedCompilations() {

Original file line number	Diff line number	Diff line change
`@@ -165,9 +165,13 @@ public Pair<HostedMethod, CompilationResult> getLastCompilation() {`
`165`	`165`	`return orderedCompilations.get(orderedCompilations.size() - 1);`
`166`	`166`	`}`
`167`	`167`
	`168`	`+ protected static Comparator<Pair<HostedMethod, CompilationResult>> compilationsComparator() {`
	`169`	`+ Comparator<Pair<HostedMethod, CompilationResult>> nameComparator = Comparator.comparing(o -> AnalysisMethod.comparingMethodNames(o.getLeft().wrapped));`
	`170`	`+ return nameComparator.thenComparing(o -> o.getRight().getTargetCodeSize());`
	`171`	`+ }`
	`172`	`+`
`168`	`173`	`protected List<Pair<HostedMethod, CompilationResult>> computeCompilationOrder(Map<HostedMethod, CompilationResult> compilationMap) {`
`169`		`- return compilationMap.entrySet().stream().map(e -> Pair.create(e.getKey(), e.getValue())).sorted(Comparator.comparing(o -> o.getLeft().wrapped.format("%H.%n(%P):%R")))`
`170`		`- .collect(Collectors.toList());`
	`174`	`+ return compilationMap.entrySet().stream().map(e -> Pair.create(e.getKey(), e.getValue())).sorted(compilationsComparator()).collect(Collectors.toList());`
`171`	`175`	`}`
`172`	`176`
`173`	`177`	`public List<Pair<HostedMethod, CompilationResult>> getOrderedCompilations() {`