Use Entity instead of Element in ConstantValue

pkg/compiler/lib/src/mirrors_used.dart

 // Copyright (c) 2013, 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.mirrors_used;
 
 import 'common/tasks.dart' show CompilerTask;
 import 'common.dart';
 import 'compile_time_constants.dart' show ConstantCompiler;
 import 'compiler.dart' show Compiler;
 import 'constants/expressions.dart';
 import 'constants/values.dart'
     show
         ConstantValue,
         ConstructedConstantValue,
         ListConstantValue,
         StringConstantValue,
         TypeConstantValue;
 import 'dart_types.dart' show DartType, InterfaceType;
 import 'elements/elements.dart'
     show
         ClassElement,
         Element,
+        FieldElement,
         ImportElement,
         LibraryElement,
         MetadataAnnotation,
-        ScopeContainerElement,
-        VariableElement;
+        ScopeContainerElement;
 import 'resolution/tree_elements.dart' show TreeElements;
 import 'tree/tree.dart' show NamedArgument, NewExpression, Node;
 
 /**
  * Compiler task that analyzes MirrorsUsed annotations.
  *
  * When importing 'dart:mirrors', it is possible to annotate the import with
  * MirrorsUsed annotation.  This is a way to declare what elements will be
  * reflected on at runtime.  Such elements, even they would normally be
  * discarded by the implicit tree-shaking algorithm must be preserved in the
@@ skipping 268 matching lines @@
       metaTargets = b.metaTargets;
     } else if (metaTargets != wildcard && b.metaTargets != null) {
       metaTargets.addAll(b.metaTargets);
     }
     return new MirrorUsage(symbols, targets, metaTargets, null);
   }
 
   /// Convert a [constant] to an instance of [MirrorUsage] using information
   /// that was resolved during [MirrorUsageAnalyzerTask.validate].
   MirrorUsage buildUsage(ConstructedConstantValue constant) {
-    Map<Element, ConstantValue> fields = constant.fields;
+    Map<FieldElement, ConstantValue> fields = constant.fields;
     ClassElement cls = compiler.commonElements.mirrorsUsedClass;
-    VariableElement symbolsField = cls.lookupLocalMember('symbols');
-    VariableElement targetsField = cls.lookupLocalMember('targets');
-    VariableElement metaTargetsField = cls.lookupLocalMember('metaTargets');
-    VariableElement overrideField = cls.lookupLocalMember('override');
+    FieldElement symbolsField = cls.lookupLocalMember('symbols');
+    FieldElement targetsField = cls.lookupLocalMember('targets');
+    FieldElement metaTargetsField = cls.lookupLocalMember('metaTargets');
+    FieldElement overrideField = cls.lookupLocalMember('override');
 
     return new MirrorUsage(
         cachedStrings[fields[symbolsField]],
         cachedElements[fields[targetsField]],
         cachedElements[fields[metaTargetsField]],
         cachedElements[fields[overrideField]]);
   }
 }
 
 /// Used to represent a resolved MirrorsUsed constant.
@@ skipping 231 matching lines @@
       // @MirrorsUsed(targets: fisk)
       //                       ^^^^
       //
       // Instead of saying 'fisk' should pretty print the problematic constant
       // value.
       return spannable;
     }
     return node;
   }
 }