| Index: sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart b/sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart
|
| index ee77566ee7bcc6400838cb27f3d401fdd12727e1..f483d2362c5e572a88b01c15a9cda15a16e36c18 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart
|
| @@ -297,10 +297,12 @@ class ClassEmitter extends CodeEmitterHelper {
|
|
|
| if (backend.isNeededForReflection(classElement)) {
|
| Link typeVars = classElement.typeVariables;
|
| - Iterable properties = [];
|
| - if (task.typeVariableHandler.typeVariablesOf(classElement) != null) {
|
| - properties = task.typeVariableHandler.typeVariablesOf(classElement)
|
| - .map(js.toExpression);
|
| + List properties = [];
|
| + for (TypeVariableType typeVar in typeVars) {
|
| + properties.add(js.string(typeVar.name.slowToString()));
|
| + properties.add(
|
| + js.toExpression(
|
| + task.metadataEmitter.reifyType(typeVar.element.bound)));
|
| }
|
|
|
| ClassElement superclass = classElement.superclass;
|
| @@ -347,15 +349,11 @@ class ClassEmitter extends CodeEmitterHelper {
|
| buffer.write(jsAst.prettyPrint(builder.toObjectInitializer(), compiler));
|
| String reflectionName = task.getReflectionName(classElement, className);
|
| if (reflectionName != null) {
|
| - if (!backend.isNeededForReflection(classElement)) {
|
| - buffer.write(',$n$n"+$reflectionName": 0');
|
| - } else {
|
| - List<int> interfaces = <int>[];
|
| - for (DartType interface in classElement.interfaces) {
|
| - interfaces.add(task.metadataEmitter.reifyType(interface));
|
| - }
|
| - buffer.write(',$n$n"+$reflectionName": $interfaces');
|
| + List<int> interfaces = <int>[];
|
| + for (DartType interface in classElement.interfaces) {
|
| + interfaces.add(task.metadataEmitter.reifyType(interface));
|
| }
|
| + buffer.write(',$n$n"+$reflectionName": $interfaces');
|
| }
|
| }
|
|
|
|
|