Sort type tests.

pkg/compiler/lib/src/elements/elements.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library elements;
 
 import '../common.dart';
 import '../common/resolution.dart' show Resolution;
 import '../constants/constructors.dart';
 import '../constants/expressions.dart';
@@ skipping 626 matching lines @@
     if (identical(op, '<<=')) return '<<';
     if (identical(op, '>>=')) return '>>';
     if (identical(op, '&=')) return '&';
     if (identical(op, '^=')) return '^';
     if (identical(op, '|=')) return '|';
     if (identical(op, '??=')) return '??';
 
     return null;
   }
 
+  /// If `true`, injected members are sorted with their corresponding class or
+  /// library.
+  ///
+  /// This is used for ensuring equivalent output order when testing against
+  /// .dill using the patched_dart2js_sdk.
+  static bool usePatchedDart2jsSdkSorting = false;

[Siggi Cherem (dart-lang), 2017/06/23 20:36:34]

+TODO - delete when patching is implemented in package:front_end?

[Johnni Winther, 2017/06/26 10:15:09]

Done.

+
   /// A `compareTo` function that places [Element]s in a consistent order based
   /// on the source code order.
   static int compareByPosition(Element a, Element b) {
     if (identical(a, b)) return 0;
     int r = utils.compareLibrariesUris(
         a.library.canonicalUri, b.library.canonicalUri);
     if (r != 0) return r;
-    r = utils.compareSourceUris(a.compilationUnit.script.readableUri,
-        b.compilationUnit.script.readableUri);
+    Uri aUri = a.compilationUnit.script.readableUri;
+    Uri bUri = b.compilationUnit.script.readableUri;
+    if (usePatchedDart2jsSdkSorting) {
+      Uri computePatchedDart2jsUri(Element e, Uri uri) {
+        if (!e.isInjected) return uri;
+        if (e.enclosingClass != null) {
+          return e.enclosingClass.compilationUnit.script.readableUri;
+        } else {
+          return e.library.compilationUnit.script.readableUri;
+        }
+      }
+
+      aUri = computePatchedDart2jsUri(a, aUri);
+      bUri = computePatchedDart2jsUri(b, bUri);
+    }
+    r = utils.compareSourceUris(aUri, bUri);
     if (r != 0) return r;
     return utils.compareEntities(a, a.sourceOffset, -1, b, b.sourceOffset, -1);
   }
 
   static List<E> sortedByPosition<E extends Element>(Iterable<E> elements) {
     return elements.toList()..sort(compareByPosition);
   }
 
   static bool isFixedListConstructorCall(
       ConstructorEntity element, Send node, CommonElements commonElements) {
@@ skipping 1206 matching lines @@
   /// by a field.
   bool get isDeclaredByField;
 
   /// Returns `true` if this member is abstract.
   bool get isAbstract;
 
   /// If abstract, [implementation] points to the overridden concrete member,
   /// if any. Otherwise [implementation] points to the member itself.
   Member get implementation;
 }