Retain type annotations for function subtyping in minified mode.

sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart

 // Copyright (c) 2012, 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 dart_backend;
 
 // TODO(ahe): This class is simply wrong.  This backend should use
 // elements when it can, not AST nodes.  Perhaps a [Map<Element,
 // TreeElements>] is what is needed.
 class ElementAst {
@@ skipping 131 matching lines @@
     workQueue.addAll(
         classMembers.keys.map((classElement) => classElement.thisType));
     workQueue.addAll(compiler.resolverWorld.isChecks);
     Element typeErrorElement =
         compiler.coreLibrary.find(new SourceString('TypeError'));
     DartType typeErrorType = typeErrorElement.computeType(compiler);
     if (workQueue.indexOf(typeErrorType) != -1) {
       return false;
     }
 
-    void processTypeArguments(Element classElement, NodeList typeArguments) {
-      if (typeArguments == null) return;
-      for (Node typeArgument in typeArguments.nodes) {
-        if (typeArgument is TypeVariable) {
-          TypeVariable typeVariable = typeArgument;
-          typeArgument = typeVariable.bound;
-        }
-        if (typeArgument == null) continue;
-        assert(typeArgument is TypeAnnotation);
-        DartType argumentType =
-            compiler.resolveTypeAnnotation(classElement, typeArgument);
-        assert(argumentType != null);
-        workQueue.add(argumentType);
-      }
-    }
-
-    void processTypeAnnotationList(Element classElement, NodeList annotations) {
-      for (Link link = annotations.nodes; !link.isEmpty; link = link.tail) {
-        TypeAnnotation typeAnnotation = link.head;
-        NodeList typeArguments = typeAnnotation.typeArguments;
-        processTypeArguments(classElement, typeArguments);
-      }
-    }
-
-    void processSuperclassTypeArguments(Element classElement, Node superclass) {
-      if (superclass == null) return;
-      MixinApplication superMixinApplication = superclass.asMixinApplication();
-      if (superMixinApplication != null) {
-        processTypeAnnotationList(classElement, superMixinApplication.mixins);
-      } else {
-        TypeAnnotation typeAnnotation = superclass;
-        NodeList typeArguments = typeAnnotation.typeArguments;
-        processTypeArguments(classElement, typeArguments);
-      }
-    }
-
     while (!workQueue.isEmpty) {
       DartType type = workQueue.removeLast();
       if (processedTypes.contains(type)) continue;
       processedTypes.add(type);
+      if (type is FunctionType) return false;
       if (type is TypedefType) return false;
       if (type is InterfaceType) {
+        InterfaceType interfaceType = type;
+        // Check all type arguments.
+        workQueue.addAll(interfaceType.typeArguments.toList());
         ClassElement element = type.element;
-        Node node = element.parseNode(compiler);
-        if (node is ClassNode) {
-          ClassNode classNode = node;
-          processTypeArguments(element, classNode.typeParameters);
-          processSuperclassTypeArguments(element, classNode.superclass);

[Anton Muhin, 2013/07/02 11:39:03]

do not you need to check superclass still?

[Johnni Winther, 2013/07/02 11:42:10]

All superclasses of [type] are handled by adding them in line 165.

[Anton Muhin, 2013/07/02 11:43:02]

Thanks!

-          processTypeAnnotationList(element, classNode.interfaces);
-        } else {
-          MixinApplication mixinNode = node;
-          processSuperclassTypeArguments(element, mixinNode.superclass);
-          if (mixinNode is NamedMixinApplication) {
-            NamedMixinApplication namedMixinNode = mixinNode;
-            processTypeArguments(element, namedMixinNode.typeParameters);
-          }
-        }
         // Check all supertypes.
         if (element.allSupertypes != null) {
           workQueue.addAll(element.allSupertypes.toList());
         }
       }
     }
     return true;
   }
 
   DartBackend(Compiler compiler, List<String> strips)
@@ skipping 174 matching lines @@
     NextClassElement:
     for (ClassElement classElement in classMembers.keys) {
       for (Element member in classMembers[classElement]) {
         if (member.isConstructor()) continue NextClassElement;
       }
       if (classElement.constructors.isEmpty) continue NextClassElement;
 
       // TODO(antonm): check with AAR team if there is better approach.
       // As an idea: provide template as a Dart code---class C { C.name(); }---
       // and then overwrite necessary parts.
-      ClassNode classNode = classElement.parseNode(compiler);
+      var classNode = classElement.parseNode(compiler);

[Johnni Winther, 2013/07/02 11:33:51]

This can also be NamedMixinApplication nodes.

[karlklose, 2013/07/02 12:16:39]

Could we let them share common base class (the MixinApplicationElement is a
subtype of ClassElement).

[Johnni Winther, 2013/07/03 05:41:57]

We could but the only thing used here is their [name] field.

       SynthesizedConstructorElementX constructor =
           new SynthesizedConstructorElementX(classElement);
       constructor.type = new FunctionType(
           constructor,
           compiler.types.voidType,
           const Link<DartType>(),
           const Link<DartType>(),
           const Link<SourceString>(),
           const Link<DartType>()
           );
@@ skipping 177 matching lines @@
 }
 
 compareElements(e0, e1) {
   int result = compareBy((e) => e.getLibrary().canonicalUri.toString())(e0, e1);
   if (result != 0) return result;
   return compareBy((e) => e.position().charOffset)(e0, e1);
 }
 
 List<Element> sortElements(Iterable<Element> elements) =>
     sorted(elements, compareElements);