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

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

 // Copyright (c) 2013, 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.
 
 part of dart2js.js_emitter;
 
 class ClassEmitter extends CodeEmitterHelper {
   /**
    * Documentation wanted -- johnniwinther
    *
@@ skipping 337 matching lines @@
     if (!buffer.isEmpty) {
       buffer.write(',$n$n');
     }
     buffer.write('$className:$_');
     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>[];
+        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');
       }
     }
   }
 
   /**
    * Calls [addField] for each of the fields of [element].
    *
    * [element] must be a [ClassElement] or a [LibraryElement].
    *
    * If [element] is a [ClassElement], the static fields of the class are
@@ skipping 227 matching lines @@
         ? new Selector.getter(member.name, member.getLibrary())
         : new Selector.setter(member.name, member.getLibrary());
     String reflectionName = task.getReflectionName(selector, name);
     if (reflectionName != null) {
       var reflectable =
           js(backend.isAccessibleByReflection(member) ? '1' : '0');
       builder.addProperty('+$reflectionName', reflectable);
     }
   }
 }