languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-19 23:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generate needed classes for constant maps in metadata.

Browse source 
BUG=http://dartbug.com/20776
R=floitsch@google.com

Review URL: https://codereview.chromium.org//541683002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@39860 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
johnniwinther@google.com 2014-09-04 11:48:48 +00:00
parent 4c747eae55
commit 7685bced04
5 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sdk/lib/_internal/compiler/implementation/compiler.dart
View file

@ -278,9 +278,9 @@ abstract class Backend {
/// Called during codegen when [constant] has been used.
void registerCompileTimeConstant(Constant constant, Registry registry) {}
/// Called during resolution when a metadata [constant] for [annotatedElement]
/// has been evaluated.
void registerMetadataConstant(Constant constant,
/// Called during resolution when a constant value for [metadata] on
/// [annotatedElement] has been evaluated.
void registerMetadataConstant(MetadataAnnotation metadata,
Element annotatedElement,
Registry registry) {}

3
sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
View file

@ -726,10 +726,11 @@ class JavaScriptBackend extends Backend {
}
}
void registerMetadataConstant(Constant constant,
void registerMetadataConstant(MetadataAnnotation metadata,
Element annotatedElement,
Registry registry) {
assert(registry.isForResolution);
Constant constant = constants.getConstantForMetadata(metadata);
registerCompileTimeConstant(constant, registry);
metadataConstants.add(new Dependency(constant, annotatedElement));
}

2
sdk/lib/_internal/compiler/implementation/resolution/members.dart
View file

@ -1407,7 +1407,7 @@ class ResolverTask extends CompilerTask {
// and the annotated element instead. This will allow the backend to
// retrieve the backend constant and only register metadata on the
// elements for which it is needed. (Issue 17732).
registry.registerMetadataConstant(annotation.value, annotatedElement);
registry.registerMetadataConstant(annotation, annotatedElement);
annotation.resolutionState = STATE_DONE;
}));
}

5
sdk/lib/_internal/compiler/implementation/resolution/registry.dart
View file

@ -205,8 +205,9 @@ class ResolutionRegistry extends Registry {
backend.resolutionCallbacks.onLazyField(this);
}
void registerMetadataConstant(Constant constant, Element annotatedElement) {
backend.registerMetadataConstant(constant, annotatedElement, this);
void registerMetadataConstant(MetadataAnnotation metadata,
Element annotatedElement) {
backend.registerMetadataConstant(metadata, annotatedElement, this);
}
void registerThrowRuntimeError() {

24
tests/lib/mirrors/metadata_const_map_test.dart Normal file
View file

@ -0,0 +1,24 @@
// Copyright (c) 2014, 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.
// Regression test for issue 20776. Tests that the needed classes for the
// constant map in the metadata are generated.
library lib;
@MirrorsUsed(targets: 'lib')
import 'dart:mirrors';
class C {
final x;
const C(this.x);
}
@C(const {'foo': 'bar' })
class A {}
main() {
print(reflectClass(A).metadata);
}