[CFE] Fix weekly bot #103

Change-Id: I214fb61b97885ea8a2219b3deef3e05a72adcb49
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/254162
Commit-Queue: Jens Johansen <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: jensjoha

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

@@ -3242,10 +3242,16 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
           });
       }
     }
+    Uri firstUri = uri!;
+    Uri secondUri = otherUri!;
+    if (firstUri.toString().compareTo(secondUri.toString()) > 0) {
+      firstUri = secondUri;
+      secondUri = uri;
+    }
     if (isExport) {
       Template<Message Function(String name, Uri uri, Uri uri2)> template =
           templateDuplicatedExport;
-      Message message = template.withArguments(name, uri!, otherUri!);
+      Message message = template.withArguments(name, firstUri, secondUri);
       addProblem(message, charOffset, noLength, fileUri);
     }
     Template<Message Function(String name, Uri uri, Uri uri2)> builderTemplate =
@@ -3256,8 +3262,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
         name,
         // TODO(ahe): We should probably use a context object here
         // instead of including URIs in this message.
-        uri!,
-        otherUri!);
+        firstUri,
+        secondUri);
     // We report the error lazily (setting suppressMessage to false) because the
     // spec 18.1 states that 'It is not an error if N is introduced by two or
     // more imports but never referred to.'

pkg/front_end/test/fasta/testing/suite.dart

@@ -1790,6 +1790,31 @@ class Strategy extends EquivalenceStrategy {
     return _isMixinOrCloneReference(visitor, node.interfaceTargetReference,
         other.interfaceTargetReference, 'interfaceTargetReference');
   }
+
+  @override
+  bool checkLibrary_problemsAsJson(
+      EquivalenceVisitor visitor, Library node, Library other) {
+    List<String>? a = node.problemsAsJson;
+    if (a != null) {
+      a = a.map(_rewriteJsonMap).toList();
+    }
+    List<String>? b = other.problemsAsJson;
+    if (b != null) {
+      b = b.map(_rewriteJsonMap).toList();
+    }
+    return visitor.checkLists(a, b, visitor.checkValues, 'problemsAsJson');
+  }
+
+  String _rewriteJsonMap(String s) {
+    // Several things can change, e.g.
+    // * unserializableExports (when from dill) causes the message code to
+    //   become "unspecified" from usage of `templateUnspecified`)
+    // * Order of things (and for instance which line it's reported on) can
+    //   change depending on order, e.g. duplicate names in exports upon
+    //   recompile of one of the exported libraries.
+    Map<String, dynamic> decoded = jsonDecode(s);
+    return decoded["uri"];
+  }
 }
 
 class FuzzAstVisitorSorterChunk {