Implement DillClass.supertype

Change-Id: I58c048a6595a2b65a7f2c239ae2bc1e6d8aab2a4
Reviewed-on: https://dart-review.googlesource.com/c/88715
Reviewed-by: Dmitry Stefantsov <[email protected]>
Commit-Queue: Peter von der Ahé <[email protected]>

Author: peter-ahe-google

pkg/front_end/lib/src/fasta/dill/dill_class_builder.dart

@@ -4,7 +4,7 @@
 
 library fasta.dill_class_builder;
 
-import 'package:kernel/ast.dart' show Class, DartType, Member;
+import 'package:kernel/ast.dart' show Class, DartType, Member, Supertype;
 
 import '../problems.dart' show unimplemented;
 
@@ -18,10 +18,12 @@ import '../kernel/kernel_builder.dart'
 
 import '../modifier.dart' show abstractMask;
 
-import 'dill_member_builder.dart' show DillMemberBuilder;
-
 import 'dill_library_builder.dart' show DillLibraryBuilder;
 
+import 'dill_loader.dart' show DillLoader;
+
+import 'dill_member_builder.dart' show DillMemberBuilder;
+
 class DillClassBuilder extends KernelClassBuilder {
   final Class cls;
 
@@ -41,6 +43,18 @@ class DillClassBuilder extends KernelClassBuilder {
             parent,
             cls.fileOffset);
 
+  KernelTypeBuilder get supertype {
+    KernelTypeBuilder supertype = super.supertype;
+    if (supertype == null) {
+      Supertype targetSupertype = cls.supertype;
+      if (targetSupertype == null) return null;
+      DillLoader loader = library.loader;
+      super.supertype = supertype =
+          loader.computeTypeBuilder(targetSupertype.asInterfaceType);
+    }
+    return supertype;
+  }
+
   @override
   Class get actualCls => cls;
 

pkg/front_end/lib/src/fasta/dill/dill_loader.dart

@@ -6,21 +6,39 @@ library fasta.dill_loader;
 
 import 'dart:async' show Future;
 
-import 'package:kernel/ast.dart' show Library, Component, Source;
+import 'package:kernel/ast.dart'
+    show
+        BottomType,
+        Class,
+        Component,
+        DartType,
+        DartTypeVisitor,
+        DynamicType,
+        FunctionType,
+        InterfaceType,
+        InvalidType,
+        Library,
+        Source,
+        TypeParameterType,
+        TypedefType,
+        VoidType;
 
 import '../fasta_codes.dart'
     show SummaryTemplate, Template, templateDillOutlineSummary;
 
 import '../compiler_context.dart' show CompilerContext;
 
-import '../kernel/kernel_builder.dart' show LibraryBuilder;
+import '../kernel/kernel_builder.dart'
+    show KernelNamedTypeBuilder, KernelTypeBuilder, LibraryBuilder;
 
 import '../loader.dart' show Loader;
 
 import '../problems.dart' show unhandled;
 
 import '../target_implementation.dart' show TargetImplementation;
 
+import 'dill_class_builder.dart' show DillClassBuilder;
+
 import 'dill_library_builder.dart' show DillLibraryBuilder;
 
 class DillLoader extends Loader<Library> {
@@ -75,4 +93,56 @@ class DillLoader extends Loader<Library> {
       library.finalizeExports();
     });
   }
+
+  KernelTypeBuilder computeTypeBuilder(DartType type) {
+    return type.accept(new TypeBuilderComputer(this));
+  }
+}
+
+class TypeBuilderComputer implements DartTypeVisitor<KernelTypeBuilder> {
+  final DillLoader loader;
+
+  const TypeBuilderComputer(this.loader);
+
+  KernelTypeBuilder defaultDartType(DartType node) {
+    throw "Unsupported";
+  }
+
+  KernelTypeBuilder visitInvalidType(InvalidType node) {
+    throw "Not implemented";
+  }
+
+  KernelTypeBuilder visitDynamicType(DynamicType node) {
+    throw "Not implemented";
+  }
+
+  KernelTypeBuilder visitVoidType(VoidType node) {
+    throw "Not implemented";
+  }
+
+  KernelTypeBuilder visitBottomType(BottomType node) {
+    throw "Not implemented";
+  }
+
+  KernelTypeBuilder visitInterfaceType(InterfaceType node) {
+    Class kernelClass = node.classNode;
+    Library kernelLibrary = kernelClass.enclosingLibrary;
+    DillLibraryBuilder library = loader.builders[kernelLibrary.importUri];
+    String name = kernelClass.name;
+    DillClassBuilder cls = library[name];
+    // TODO(ahe): Also compute type arguments.
+    return new KernelNamedTypeBuilder(name, null)..bind(cls);
+  }
+
+  KernelTypeBuilder visitFunctionType(FunctionType node) {
+    throw "Not implemented";
+  }
+
+  KernelTypeBuilder visitTypeParameterType(TypeParameterType node) {
+    throw "Not implemented";
+  }
+
+  KernelTypeBuilder visitTypedefType(TypedefType node) {
+    throw "Not implemented";
+  }
 }

pkg/front_end/lib/src/fasta/dill/dill_member_builder.dart

@@ -62,6 +62,8 @@ class DillMemberBuilder extends MemberBuilder {
         name == "" &&
         (charOffset == parent.charOffset || charOffset == -1);
   }
+
+  bool get isField => member is Field;
 }
 
 int computeModifiers(Member member) {