| Index: pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
|
| diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
|
| index 94f66afe232ce415ebedb324f93413467ee74a6b..216b7d0d0a110430415e5217cd1067323409fcc3 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
|
| @@ -118,7 +118,8 @@ class ClassEmitter extends CodeEmitterHelper {
|
| // accessors at runtime.
|
| bool needsFieldsForConstructor = !emitStatics && !classIsNative;
|
| if (needsFieldsForConstructor || needsAccessor) {
|
| - var metadata = task.metadataEmitter.buildMetadataFunction(fieldElement);
|
| + var metadata =
|
| + task.metadataCollector.buildMetadataFunction(fieldElement);
|
| if (metadata != null) {
|
| hasMetadata = true;
|
| } else {
|
| @@ -162,7 +163,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| }
|
| if (backend.isAccessibleByReflection(fieldElement)) {
|
| DartType type = fieldElement.type;
|
| - reflectionMarker = '-${task.metadataEmitter.reifyType(type)}';
|
| + reflectionMarker = '-${task.metadataCollector.reifyType(type)}';
|
| }
|
| String builtFieldname = '$fieldName$fieldCode$reflectionMarker';
|
| builder.addField(builtFieldname);
|
| @@ -278,7 +279,7 @@ class ClassEmitter extends CodeEmitterHelper {
|
| ClassElement classElement = cls.element;
|
| String className = cls.name;
|
|
|
| - var metadata = task.metadataEmitter.buildMetadataFunction(classElement);
|
| + var metadata = task.metadataCollector.buildMetadataFunction(classElement);
|
| if (metadata != null) {
|
| classBuilder.addProperty("@", metadata);
|
| }
|
| @@ -331,10 +332,10 @@ class ClassEmitter extends CodeEmitterHelper {
|
| } else {
|
| List<int> types = <int>[];
|
| if (classElement.supertype != null) {
|
| - types.add(task.metadataEmitter.reifyType(classElement.supertype));
|
| + types.add(task.metadataCollector.reifyType(classElement.supertype));
|
| }
|
| for (DartType interface in classElement.interfaces) {
|
| - types.add(task.metadataEmitter.reifyType(interface));
|
| + types.add(task.metadataCollector.reifyType(interface));
|
| }
|
| enclosingBuilder.addProperty("+$reflectionName",
|
| new jsAst.ArrayInitializer(types.map(js.number).toList()));
|
|
|