Chromium Code Reviews| Index: pkg/compiler/lib/src/kernel/element_map.dart |
| diff --git a/pkg/compiler/lib/src/kernel/element_map.dart b/pkg/compiler/lib/src/kernel/element_map.dart |
| index e06d3b3ab85338ccac615f072dbb6de6933518f8..1871b1821a1d7bfbcf8ed12853737257a68d272f 100644 |
| --- a/pkg/compiler/lib/src/kernel/element_map.dart |
| +++ b/pkg/compiler/lib/src/kernel/element_map.dart |
| @@ -800,9 +800,9 @@ class _KClassEnv { |
| } |
| } |
| - 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; |
| } |
| @@ -810,12 +810,20 @@ class _KClassEnv { |
| 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 { |
| @@ -1040,6 +1048,16 @@ class KernelElementEnvironment implements ElementEnvironment { |
| // 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]. |