Add kind to 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;
@@ skipping 130 matching lines @@
   int visitInterceptor(InterceptorConstantValue a, InterceptorConstantValue b) {
     return compareDartTypes(a.dispatchedType, b.dispatchedType);
   }
 
   int visitSynthetic(SyntheticConstantValue a, SyntheticConstantValue b) {
     // [SyntheticConstantValue]s have abstract fields that are set only by
     // convention.  Lucky for us, they do not occur as top level constant, only
     // as elements of a few constants.  If this becomes a source of instability,
     // we will need to add a total ordering on JavaScript ASTs including
     // deferred elements.
-    SyntheticConstantKind aKind = a.kind;
-    SyntheticConstantKind bKind = b.kind;
+    SyntheticConstantKind aKind = a.valueKind;
+    SyntheticConstantKind bKind = b.valueKind;
     int r = aKind.index - bKind.index;
     if (r != 0) return r;
-    switch (a.kind) {
+    switch (aKind) {
       case SyntheticConstantKind.DUMMY_INTERCEPTOR:
       case SyntheticConstantKind.EMPTY_VALUE:
         // Never emitted.
         return 0;
 
       case SyntheticConstantKind.TYPEVARIABLE_REFERENCE:
         // An opaque deferred JS AST reference to a type in reflection data.
         return 0;
       case SyntheticConstantKind.NAME:
         // An opaque deferred JS AST reference to a name.
@@ skipping 40 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;
 }