Remove uses of DartObjectImpl

lib/src/utils.dart

 // Copyright (c) 2015, 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.
 
 /// Holds a couple utility functions used at various places in the system.
 library dev_compiler.src.utils;
 
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
 import 'package:analyzer/src/generated/ast.dart'
     show
         ImportDirective,
         ExportDirective,
         PartDirective,
         CompilationUnit,
         Identifier,
         AnnotatedNode,
         AstNode,
         Expression,
         SimpleIdentifier,
         MethodInvocation;
-import 'package:analyzer/src/generated/constant.dart' show DartObjectImpl;
+import 'package:analyzer/src/generated/constant.dart' show DartObject;
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart'
     show ParseDartTask, AnalysisContext;
 import 'package:analyzer/src/generated/error.dart' show ErrorCode;
 import 'package:analyzer/src/generated/resolver.dart' show TypeProvider;
 import 'package:analyzer/src/generated/source.dart' show LineInfo, Source;
 import 'package:analyzer/analyzer.dart' show parseDirectives;
 import 'package:crypto/crypto.dart' show CryptoUtils, MD5;
 import 'package:source_span/source_span.dart';
 
@@ skipping 297 matching lines @@
 /// For example if we had the ClassDeclaration node for `FontElement`:
 ///
 ///    @JsName('HTMLFontElement')
 ///    @deprecated
 ///    class FontElement { ... }
 ///
 /// We could match `@deprecated` with a test function like:
 ///
 ///    (v) => v.type.name == 'Deprecated' && v.type.element.library.isDartCore
 ///
-DartObjectImpl findAnnotation(
-    Element element, bool test(DartObjectImpl value)) {
+DartObject findAnnotation(Element element, bool test(DartObject value)) {
   for (var metadata in element.metadata) {
-    var evalResult = metadata.evaluationResult;
-    if (evalResult == null) continue;
-
-    var value = evalResult.value;
+    var value = metadata.constantValue;
     if (value != null && test(value)) return value;
   }
   return null;
 }
 
 /// Given a constant [value], a [fieldName], and an [expectedType], returns the
 /// value of that field.
 ///
 /// If the field is missing or is not [expectedType], returns null.
-Object getConstantField(
-    DartObjectImpl value, String fieldName, DartType expectedType) {
-  if (value == null) return null;
-  var f = value.fields[fieldName];
-  return (f == null || f.type != expectedType) ? null : f.value;
+DartObject getConstantField(
+    DartObject value, String fieldName, DartType expectedType) {
+  var f = value?.getField(fieldName);
+  return (f == null || f.type != expectedType) ? null : f;
 }
 
 DartType fillDynamicTypeArgs(DartType t, TypeProvider types) {
   if (t is ParameterizedType) {
     var dyn = new List.filled(t.typeArguments.length, types.dynamicType);
     return t.substitute2(dyn, t.typeArguments);
   }
   return t;
 }
 
@@ skipping 53 matching lines @@
   }
 }
 
 bool isInlineJS(Element e) => e is FunctionElement &&
     e.library.source.uri.toString() == 'dart:_foreign_helper' &&
     e.name == 'JS';
 
 bool isDartMathMinMax(Element e) => e is FunctionElement &&
     e.library.source.uri.toString() == 'dart:math' &&
     (e.name == 'min' || e.name == 'max');