Use Entity instead of Element in ConstantValue

pkg/compiler/lib/src/js_emitter/constant_ordering.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 dart2js.js_emitter.constant_ordering;
 
 import '../constants/values.dart';
 import '../dart_types.dart';
-import '../elements/elements.dart' show Element, Elements, FieldElement;
+import '../elements/elements.dart' show Entity, Elements;
+import '../elements/entities.dart' show FieldEntity;
 import '../js_backend/js_backend.dart' show SyntheticConstantKind;
 import '../tree/dartstring.dart' show DartString;
 
 /// A canonical but arbrary ordering of constants. The ordering is 'stable'
 /// under perturbation of the source.
 int deepCompareConstants(ConstantValue a, ConstantValue b) {
   return _CompareVisitor.compareValues(a, b);
 }
 
 class _CompareVisitor implements ConstantValueVisitor<int, ConstantValue> {
@@ skipping 17 matching lines @@
   static int compareLists(int compare(a, b), List a, List b) {
     int r = a.length.compareTo(b.length);
     if (r != 0) return r;
     for (int i = 0; i < a.length; i++) {
       r = compare(a[i], b[i]);
       if (r != 0) return r;
     }
     return 0;
   }
 
-  static int compareElements(Element a, Element b) {
+  static int compareElements(Entity a, Entity b) {
     int r = a.name.compareTo(b.name);
     if (r != 0) return r;
     return Elements.compareByPosition(a, b);
   }
 
   static int compareDartTypes(DartType a, DartType b) {
     if (a == b) return 0;
     int r = a.kind.index.compareTo(b.kind.index);
     if (r != 0) return r;
     r = compareNullable(compareElements, a.element, b.element);
@@ skipping 54 matching lines @@
     if (r != 0) return r;
     r = compareLists(compareValues, a.values, b.values);
     if (r != 0) return r;
     return compareDartTypes(a.type, b.type);
   }
 
   int visitConstructed(ConstructedConstantValue a, ConstructedConstantValue b) {
     int r = compareDartTypes(a.type, b.type);
     if (r != 0) return r;
 
-    List<FieldElement> aFields = a.fields.keys.toList()..sort(compareElements);
-    List<FieldElement> bFields = b.fields.keys.toList()..sort(compareElements);
+    List<FieldEntity> aFields = a.fields.keys.toList()..sort(compareElements);
+    List<FieldEntity> bFields = b.fields.keys.toList()..sort(compareElements);
 
     r = compareLists(compareElements, aFields, bFields);
     if (r != 0) return r;
 
     return compareLists(
         compareValues,
         aFields.map((field) => a.fields[field]).toList(),
         aFields.map((field) => b.fields[field]).toList());
   }
 
@@ skipping 71 matching lines @@
   int visitBool(BoolConstantValue a, _) => BOOL;
   int visitString(StringConstantValue a, _) => STRING;
   int visitList(ListConstantValue a, _) => LIST;
   int visitMap(MapConstantValue a, _) => MAP;
   int visitConstructed(ConstructedConstantValue a, _) => CONSTRUCTED;
   int visitType(TypeConstantValue a, _) => TYPE;
   int visitInterceptor(InterceptorConstantValue a, _) => INTERCEPTOR;
   int visitSynthetic(SyntheticConstantValue a, _) => SYNTHETIC;
   int visitDeferred(DeferredConstantValue a, _) => DEFERRED;
 }