jdk-sandbox: comparison src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java

equal deleted inserted replaced

-:767678b5e61b
+:abccada595dd
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 // new Map$Entry[size]
 pushInt(mv, map.size());
 mv.visitTypeInsn(ANEWARRAY, "java/util/Map$Entry");
 int index = 0;
-for (Map.Entry<String, Set<String>> e : map.entrySet()) {
+for (var e : new TreeMap<>(map).entrySet()) {
 String name = e.getKey();
 Set<String> s = e.getValue();
 mv.visitInsn(DUP);
 pushInt(mv, index);
 // use Set.of(Object) or Set.of(Object, Object) when fewer
 if (size > 2) {
 pushInt(mv, size);
 mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
 int i = 0;
-for (String element : set) {
+for (String element : sorted(set)) {
 mv.visitInsn(DUP);
 pushInt(mv, i);
 mv.visitLdcInsn(element);
 mv.visitInsn(AASTORE);
 i++;
 "of",
 "([Ljava/lang/Object;)Ljava/util/Set;",
 true);
 } else {
 StringBuilder sb = new StringBuilder("(");
-for (String element : set) {
+for (String element : sorted(set)) {
 mv.visitLdcInsn(element);
 sb.append("Ljava/lang/Object;");
 }
 sb.append(")Ljava/util/Set;");
 mv.visitMethodInsn(INVOKESTATIC,
 void requires(Set<Requires> requires) {
 mv.visitVarInsn(ALOAD, BUILDER_VAR);
 pushInt(mv, requires.size());
 mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Requires");
 int arrayIndex = 0;
-for (Requires require : requires) {
+for (Requires require : sorted(requires)) {
 String compiledVersion = null;
 if (require.compiledVersion().isPresent()) {
 compiledVersion = require.compiledVersion().get().toString();
 }
 void exports(Set<Exports> exports) {
 mv.visitVarInsn(ALOAD, BUILDER_VAR);
 pushInt(mv, exports.size());
 mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Exports");
 int arrayIndex = 0;
-for (Exports export : exports) {
+for (Exports export : sorted(exports)) {
 mv.visitInsn(DUP);    // arrayref
 pushInt(mv, arrayIndex++);
 newExports(export.modifiers(), export.source(), export.targets());
 mv.visitInsn(AASTORE);
 }
 void opens(Set<Opens> opens) {
 mv.visitVarInsn(ALOAD, BUILDER_VAR);
 pushInt(mv, opens.size());
 mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Opens");
 int arrayIndex = 0;
-for (Opens open : opens) {
+for (Opens open : sorted(opens)) {
 mv.visitInsn(DUP);    // arrayref
 pushInt(mv, arrayIndex++);
 newOpens(open.modifiers(), open.source(), open.targets());
 mv.visitInsn(AASTORE);
 }
 void provides(Collection<Provides> provides) {
 mv.visitVarInsn(ALOAD, BUILDER_VAR);
 pushInt(mv, provides.size());
 mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Provides");
 int arrayIndex = 0;
-for (Provides provide : provides) {
+for (Provides provide : sorted(provides)) {
 mv.visitInsn(DUP);    // arrayref
 pushInt(mv, arrayIndex++);
 newProvides(provide.service(), provide.providers());
 mv.visitInsn(AASTORE);
 }
 newModuleHashesBuilder();
 // Invoke ModuleHashes.Builder::hashForModule
 recordedHashes
 .names()
+.stream()
+.sorted()
 .forEach(mn -> hashForModule(mn, recordedHashes.hashFor(mn)));
 // Put ModuleHashes into the hashes array
 pushModuleHashes();
 }
 * for a given set of elements and assign to a local variable slot.
 * When there is only one single reference to a Set<T>,
 * it will reuse defaultVarIndex.  For a Set with multiple references,
 * it will use a new local variable retrieved from the nextLocalVar
 */
-class SetBuilder<T> {
+class SetBuilder<T extends Comparable<T>> {
 private final Set<T> elements;
 private final int defaultVarIndex;
 private final IntSupplier nextLocalVar;
 private int refCount;
 private int localVarIndex;
 private void generateSetOf(int index) {
 if (elements.size() <= 10) {
 // call Set.of(e1, e2, ...)
 StringBuilder sb = new StringBuilder("(");
-for (T t : elements) {
+for (T t : sorted(elements)) {
 sb.append("Ljava/lang/Object;");
 visitElement(t, mv);
 }
 sb.append(")Ljava/util/Set;");
 mv.visitMethodInsn(INVOKESTATIC, "java/util/Set",
 } else {
 // call Set.of(E... elements)
 pushInt(mv, elements.size());
 mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
 int arrayIndex = 0;
-for (T t : elements) {
+for (T t : sorted(elements)) {
 mv.visitInsn(DUP);    // arrayref
 pushInt(mv, arrayIndex);
 visitElement(t, mv);  // value
 mv.visitInsn(AASTORE);
 arrayIndex++;
 /*
 * Generates bytecode to create one single instance of EnumSet
 * for a given set of modifiers and assign to a local variable slot.
 */
-class EnumSetBuilder<T> extends SetBuilder<T> {
+class EnumSetBuilder<T extends Comparable<T>> extends SetBuilder<T> {
 private final String className;
 EnumSetBuilder(Set<T> modifiers, String className,
 int defaultVarIndex,
 mv.visitCode();
 pushInt(mv, map.size());
 mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
 int index = 0;
-for (String moduleName : map.keySet()) {
+for (String moduleName : sorted(map.keySet())) {
 mv.visitInsn(DUP);                  // arrayref
 pushInt(mv, index);
 mv.visitLdcInsn(moduleName);
 mv.visitInsn(AASTORE);
 index++;
 mv.visitCode();
 pushInt(mv, map.size());
 mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
 index = 0;
-for (String className : map.values()) {
+for (String className : sorted(map.values())) {
 mv.visitInsn(DUP);                  // arrayref
 pushInt(mv, index);
 mv.visitLdcInsn(className.replace('/', '.'));
 mv.visitInsn(AASTORE);
 index++;
 String rn = "/java.base/" + SYSTEM_MODULES_MAP_CLASS + ".class";
 ResourcePoolEntry e = ResourcePoolEntry.create(rn, cw.toByteArray());
 out.add(e);
 return rn;
+}
+/**
+* Returns a sorted copy of a collection.
+*
+* This is useful to ensure a deterministic iteration order.
+*
+* @return a sorted copy of the given collection.
+*/
+private static <T extends Comparable<T>> List<T> sorted(Collection<T> c) {
+var l = new ArrayList<T>(c);
+Collections.sort(l);
+return l;
 }
 /**
 * Pushes an int constant
 */

changeset 52814	abccada595dd
parent 52515	746df0ae4fe1
child 59133	580fb715b29d