Replace ResolvedNode by ConstantExpression.

pkg/compiler/lib/src/mirrors/dart2js_mirrors.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.mirrors;
 
 import 'dart:collection' show UnmodifiableListView, UnmodifiableMapView;
 
 import '../constants/expressions.dart';
 import '../constants/values.dart';
@@ skipping 430 matching lines @@
   // TODO(johnniwinther): make sure that these are returned in declaration
   // order.
   void _forEachElement(f(Element element)) => _element.forEachLocalMember(f);
 
   Iterable<DeclarationMirror> _getDeclarationMirrors(Element element) =>
       _library._getDeclarationMirrors(element);
 
   Uri get uri => _element.script.resourceUri;
 }
 
-class ResolvedNode {
-  final node;
-  final _elements;
-  final _mirrorSystem;
-  ResolvedNode(this.node, this._elements, this._mirrorSystem);
-
-  Mirror resolvedMirror(node) {
-    var element = _elements[node];
-    if (element == null) return null;
-    return _convertElementToDeclarationMirror(_mirrorSystem, element);
-  }
-}
-
 /**
  * Transitional class that allows access to features that have not yet
  * made it to the mirror API.
  *
  * All API in this class is experimental.
  */
 class BackDoor {
   /// Return the compilation units comprising [library].
   static List<Mirror> compilationUnitsOf(Dart2JsLibraryMirror library) {
     return library._element.compilationUnits.mapToList(
         (cu) => new Dart2JsCompilationUnitMirror(cu, library));
   }
 
-  static Iterable metadataSyntaxOf(Dart2JsElementMirror declaration) {
-    Compiler compiler = declaration.mirrorSystem.compiler;
-    return declaration._element.metadata.map((metadata) {
-      var node = metadata.parseNode(compiler);
-      var treeElements = metadata.annotatedElement.treeElements;
-      return new ResolvedNode(
-          node, treeElements, declaration.mirrorSystem);
-    });
+  static Iterable<ConstantExpression> metadataSyntaxOf(
+      Dart2JsElementMirror declaration) {
+    return declaration._element.metadata.map((metadata) => metadata.constant);
   }
 
-  static ResolvedNode initializerSyntaxOf(Dart2JsFieldMirror variable) {
-    var node = variable._variable.initializer;
-    if (node == null) return null;
-    return new ResolvedNode(
-        node, variable._variable.treeElements, variable.mirrorSystem);
+  static ConstantExpression initializerSyntaxOf(Dart2JsFieldMirror variable) {
+    Compiler compiler = variable.mirrorSystem.compiler;
+    return compiler.constants.getConstantForVariable(variable._variable);
   }
 
-  static ResolvedNode defaultValueSyntaxOf(Dart2JsParameterMirror parameter) {
+  static ConstantExpression defaultValueSyntaxOf(
+        Dart2JsParameterMirror parameter) {
     if (!parameter.hasDefaultValue) return null;
     ParameterElement parameterElement = parameter._element;
-    var node = parameterElement.initializer;
-    var treeElements = parameterElement.treeElements;
-    return new ResolvedNode(node, treeElements, parameter.mirrorSystem);
+    Compiler compiler = parameter.mirrorSystem.compiler;
+    return compiler.constants.getConstantForVariable(parameterElement);
+  }
+
+  static Mirror getMirrorFromElement(Dart2JsMirror mirror, Element element) {
+    return _convertElementToDeclarationMirror(mirror.mirrorSystem, element);
   }
 }