Recover from bad supertypes.

pkg/front_end/lib/src/fasta/kernel/kernel_target.dart

 // Copyright (c) 2016, 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.
 
 library fasta.kernel_target;
 
 import 'dart:async' show Future;
 
 import 'dart:io' show File, IOSink;
 
@@ skipping 114 matching lines @@
     return new KernelLibraryBuilder(uri, fileUri, loader);
   }
 
   void addDirectSupertype(ClassBuilder cls, Set<ClassBuilder> set) {
     if (cls == null) return;
     TypeBuilder supertype = cls.supertype;
     add(NamedTypeBuilder type) {
       Builder builder = type.builder;
       if (builder is ClassBuilder) {
         set.add(builder);
-      } else if (builder is! InvalidTypeBuilder &&
-          builder is! DynamicTypeBuilder) {
-        internalError("Unhandled: ${builder.runtimeType}");
       }
     }
 
     if (supertype == null) {
       // OK.
     } else if (supertype is MixinApplicationBuilder) {
       add(supertype.supertype);
       for (NamedTypeBuilder t in supertype.mixins) {
         add(t);
       }
@@ skipping 92 matching lines @@
   Future<Program> writeOutline(Uri uri) async {
     if (loader.first == null) return null;
     try {
       await loader.buildOutlines();
       loader.resolveParts();
       loader.computeLibraryScopes();
       loader.resolveTypes();
       loader.buildProgram();
       loader.checkSemantics();
       List<SourceClassBuilder> sourceClasses = collectAllSourceClasses();
-      installDefaultSupertypes(sourceClasses);
+      installDefaultSupertypes();
       installDefaultConstructors(sourceClasses);
       loader.resolveConstructors();
       loader.finishTypeVariables(objectClassBuilder);
       program = link(new List<Library>.from(loader.libraries));
       if (uri == null) return program;
       return await writeLinkedProgram(uri, program, isFullProgram: false);
     } on InputError catch (e) {
       return handleInputError(uri, e, isFullProgram: false);
     } catch (e, s) {
       return reportCrash(e, s, loader?.currentUriForCrashReporting);
@@ skipping 85 matching lines @@
       await sink.close();
     }
     if (isFullProgram) {
       ticker.logMs("Wrote program to ${uri.toFilePath()}");
     } else {
       ticker.logMs("Wrote outline to ${uri.toFilePath()}");
     }
     return null;
   }
 
-  void installDefaultSupertypes(List<SourceClassBuilder> builders) {
+  void installDefaultSupertypes() {
     Class objectClass = this.objectClass;
-    for (SourceClassBuilder builder in builders) {
-      Class cls = builder.target;
-      if (cls != objectClass) {
-        cls.supertype ??= objectClass.asRawSupertype;
-      }
-      if (builder.isMixinApplication) {
-        cls.mixedInType = builder.mixedInType.buildSupertype();
-      }
-    }
+    loader.builders.forEach((Uri uri, LibraryBuilder library) {

[Johnni Winther, 2017/03/03 13:43:08]

Why this change? Was the output of [collectAllSourceClasses] not valid, and if
so, should it still be used in [installDefaultConstructors] ?

+      library.members.forEach((String name, Builder builder) {
+        if (builder is SourceClassBuilder) {
+          Class cls = builder.target;
+          if (cls != objectClass) {
+            cls.supertype ??= objectClass.asRawSupertype;
+          }
+          if (builder.isMixinApplication) {
+            cls.mixedInType = builder.mixedInType.buildSupertype(library);

[ahe, 2017/03/03 13:52:52]

I need access to the library here.

+          }
+        }
+      });
+    });
     ticker.logMs("Installed Object as implicit superclass");
   }
 
   void installDefaultConstructors(List<SourceClassBuilder> builders) {
     Class objectClass = this.objectClass;
     for (SourceClassBuilder builder in builders) {
       if (builder.target != objectClass) {
         installDefaultConstructor(builder);
       }
     }
@@ skipping 226 matching lines @@
   }
   for (Constructor constructor in superclass.constructors) {
     if (constructor.name.name.isEmpty) {
       return constructor.function.requiredParameterCount == 0
           ? constructor
           : null;
     }
   }
   return null;
 }