| Index: pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
|
| diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
|
| index 31c45c506990dc88b690cf43558da4f479d16c28..b221f8889a045c6766dbdb998b9e8aeed9c0c450 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
|
| @@ -373,7 +373,7 @@ class ContainerBuilder extends CodeEmitterHelper {
|
| backend.rti.getSignatureEncoding(memberType, thisAccess);
|
| } else {
|
| memberTypeExpression =
|
| - js.number(task.metadataEmitter.reifyType(memberType));
|
| + js.number(task.metadataCollector.reifyType(memberType));
|
| }
|
| } else {
|
| memberTypeExpression = js('null');
|
| @@ -386,20 +386,20 @@ class ContainerBuilder extends CodeEmitterHelper {
|
| ..add(js.number(requiredParameterCount))
|
| ..add(js.number(optionalParameterCount))
|
| ..add(memberTypeExpression)
|
| - ..addAll(task.metadataEmitter
|
| + ..addAll(task.metadataCollector
|
| .reifyDefaultArguments(member).map(js.number));
|
|
|
| if (canBeReflected || canBeApplied) {
|
| parameters.forEachParameter((Element parameter) {
|
| expressions.add(
|
| - js.number(task.metadataEmitter.reifyName(parameter.name)));
|
| + js.number(task.metadataCollector.reifyName(parameter.name)));
|
| if (backend.mustRetainMetadata) {
|
| Iterable<int> metadataIndices =
|
| parameter.metadata.map((MetadataAnnotation annotation) {
|
| ConstantValue constant =
|
| backend.constants.getConstantForMetadata(annotation).value;
|
| backend.constants.addCompileTimeConstantForEmission(constant);
|
| - return task.metadataEmitter.reifyMetadata(annotation);
|
| + return task.metadataCollector.reifyMetadata(annotation);
|
| });
|
| expressions.add(new jsAst.ArrayInitializer(
|
| metadataIndices.map(js.number).toList()));
|
| @@ -419,7 +419,8 @@ class ContainerBuilder extends CodeEmitterHelper {
|
| }
|
| expressions
|
| ..add(reflectionName)
|
| - ..addAll(task.metadataEmitter.computeMetadata(member).map(js.number));
|
| + ..addAll(task.metadataCollector
|
| + .computeMetadata(member).map(js.number));
|
| } else if (isClosure && canBeApplied) {
|
| expressions.add(js.string(namer.privateName(member.library,
|
| member.name)));
|
|
|