Make JavaScriptBackend.processAnnotations element-model agnostic

pkg/compiler/lib/src/kernel/element_map.dart

 // Copyright (c) 2017, 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.kernel.element_map;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../common/resolution.dart';
@@ skipping 782 matching lines @@
     _memberMap.values.forEach(f);
     for (ir.Member member in _setterMap.values) {
       if (member is ir.Procedure) {
         f(member);
       } else {
         // Skip fields; these are also in _memberMap.
       }
     }
   }
 
-  Iterable<ConstantExpression> getMetadata(KernelToElementMap worldBuilder) {
+  Iterable<ConstantExpression> getMetadata(KernelToElementMap elementMap) {
     if (_metadata == null) {
-      _metadata = worldBuilder.getMetadata(cls.annotations);
+      _metadata = elementMap.getMetadata(cls.annotations);
     }
     return _metadata;
   }
 }
 
 class _MemberData {
   final ir.Member node;
+  Iterable<ConstantExpression> _metadata;
 
   _MemberData(this.node);
 
   ResolutionImpact getWorldImpact(KernelToElementMap elementMap) {
     return buildKernelImpact(node, elementMap);
   }
+
+  Iterable<ConstantExpression> getMetadata(KernelToElementMap elementMap) {
+    if (_metadata == null) {
+      _metadata = elementMap.getMetadata(node.annotations);

[Siggi Cherem (dart-lang), 2017/05/02 20:04:22]

nit: replace with ??=

[Johnni Winther, 2017/05/03 08:05:59]

Done.

+    }
+    return _metadata;
+  }
 }
 
 class _FunctionData extends _MemberData {
   final ir.FunctionNode functionNode;
   FunctionType _type;
   CallStructure _callStructure;
 
   _FunctionData(ir.Member node, this.functionNode) : super(node);
 
   FunctionType getFunctionType(KernelToElementMap elementMap) {
@@ skipping 204 matching lines @@
   CallStructure getCallStructure(KFunction function) {
     _FunctionData data = elementMap._memberList[function.memberIndex];
     return data.callStructure;
   }
 
   @override
   bool isDeferredLoadLibraryGetter(KMember member) {
     // TODO(johnniwinther): Support these.
     return false;
   }
+
+  @override
+  Iterable<ConstantValue> getMemberMetadata(KMember member) {
+    List<ConstantValue> values = <ConstantValue>[];
+    _MemberData memberData = elementMap._memberList[member.memberIndex];
+    for (ConstantExpression constant in memberData.getMetadata(elementMap)) {
+      values.add(elementMap.constantEnvironment.getConstantValue(constant));
+    }
+    return values;
+  }
 }
 
 /// Visitor that converts kernel dart types into [DartType].
 class DartTypeConverter extends ir.DartTypeVisitor<DartType> {
   final KernelToElementMap elementAdapter;
   bool topLevel = true;
 
   DartTypeConverter(this.elementAdapter);
 
   DartType convert(ir.DartType type) {
@@ skipping 244 matching lines @@
   }
 
   InterfaceType getMixinTypeForClass(KClass cls) {
     _KClassEnv env = builder._classEnvs[cls.classIndex];
     ir.Supertype mixedInType = env.cls.mixedInType;
     if (mixedInType == null) return null;
     return builder.createInterfaceType(
         mixedInType.classNode, mixedInType.typeArguments);
   }
 }