Reapply "Substitute types in generic superclasses and interfaces." .

sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart

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 6ea330edf4b3ca841a15391d92c23f1782a66a0e..888447e66caa738c65a39470f6b349070a9c5854 100644
--- a/sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart
@@ -355,11 +355,15 @@ class ClassEmitter extends CodeEmitterHelper {
       if (!backend.isNeededForReflection(classElement)) {
         buffer.write(',$n$n"+$reflectionName": 0');
       } else {
-        List<int> interfaces = <int>[];
+        List<int> types = <int>[];
+        if (classElement.supertype != null) {
+          types.add(
+              task.metadataEmitter.reifyType(classElement.supertype));
+        }
         for (DartType interface in classElement.interfaces) {
-          interfaces.add(task.metadataEmitter.reifyType(interface));
+          types.add(task.metadataEmitter.reifyType(interface));
         }
-        buffer.write(',$n$n"+$reflectionName": $interfaces');
+        buffer.write(',$n$n"+$reflectionName": $types');
       }
     }
   }