Remove ConstantExpression.value

pkg/compiler/lib/src/js_emitter/metadata_collector.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.
 
 part of dart2js.js_emitter;
 
 class MetadataCollector {
   final Compiler _compiler;
   final Emitter _emitter;
 
@@ skipping 31 matching lines @@
   /// mirrors_patch to implement DeclarationMirror.metadata.
   jsAst.Fun buildMetadataFunction(Element element) {
     if (!_mustEmitMetadataFor(element)) return null;
     return _compiler.withCurrentElement(element, () {
       List<jsAst.Expression> metadata = <jsAst.Expression>[];
       Link link = element.metadata;
       // TODO(ahe): Why is metadata sometimes null?
       if (link != null) {
         for (; !link.isEmpty; link = link.tail) {
           MetadataAnnotation annotation = link.head;
-          ConstantExpression constant =
-              _backend.constants.getConstantForMetadata(annotation);
+          ConstantValue constant =
+              _backend.constants.getConstantValueForMetadata(annotation);
           if (constant == null) {
             _compiler.internalError(annotation, 'Annotation value is null.');
           } else {
-            metadata.add(_emitter.constantReference(constant.value));
+            metadata.add(_emitter.constantReference(constant));
           }
         }
       }
       if (metadata.isEmpty) return null;
       return js('function() { return # }',
           new jsAst.ArrayInitializer(metadata));
     });
   }
 
   List<int> reifyDefaultArguments(FunctionElement function) {
     FunctionSignature signature = function.functionSignature;
     if (signature.optionalParameterCount == 0) return const [];
     List<int> defaultValues = <int>[];
     for (ParameterElement element in signature.optionalParameters) {
-      ConstantExpression constant =
-          _backend.constants.getConstantForVariable(element);
+      ConstantValue constant =
+          _backend.constants.getConstantValueForVariable(element);
       jsAst.Expression expression = (constant == null)
           ? null
-          : _emitter.constantReference(constant.value);
+          : _emitter.constantReference(constant);
       defaultValues.add(addGlobalMetadata(expression));
     }
     return defaultValues;
   }
 
   int reifyMetadata(MetadataAnnotation annotation) {
-    ConstantExpression constant =
-        _backend.constants.getConstantForMetadata(annotation);
+    ConstantValue constant =
+        _backend.constants.getConstantValueForMetadata(annotation);
     if (constant == null) {
       _compiler.internalError(annotation, 'Annotation value is null.');
       return -1;
     }
-    return addGlobalMetadata(_emitter.constantReference(constant.value));
+    return addGlobalMetadata(_emitter.constantReference(constant));
   }
 
   int reifyType(DartType type, {bool ignoreTypeVariables: false}) {
     return reifyTypeForOutputUnit(type,
                                   _compiler.deferredLoadTask.mainOutputUnit,
                                   ignoreTypeVariables: ignoreTypeVariables);
   }
 
   int reifyTypeForOutputUnit(DartType type, OutputUnit outputUnit,
                              {bool ignoreTypeVariables: false}) {
@@ skipping 57 matching lines @@
       // TODO(ahe): Why is metadata sometimes null?
       if (link != null) {
         for (; !link.isEmpty; link = link.tail) {
           metadata.add(reifyMetadata(link.head));
         }
       }
       return metadata;
     });
   }
 }