Canonicalize raw type

sdk/lib/_internal/compiler/implementation/typechecker.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 dart2js;
 
 class TypeCheckerTask extends CompilerTask {
   TypeCheckerTask(Compiler compiler) : super(compiler);
   String get name => "Type checker";
 
@@ skipping 69 matching lines @@
    * name is bound. The unaliased version of any other type is the type itself.
    *
    * For example, the unaliased type of [: typedef A Func<A,B>(B b) :] is the
    * function type [: (B) -> A :] and the unaliased type of
    * [: Func<int,String> :] is the function type [: (String) -> int :].
    */
   DartType unalias(Compiler compiler);
 
   bool operator ==(other);
 
+  /**
+   * Is [: true :] if this type has no explict type arguments.
+   */
+  bool get isRaw => true;
+
   DartType asRaw() => this;
 }
 
 /**
  * Represents a type variable, that is the type parameters of a class type.
  *
  * For example, in [: class Array<E> { ... } :], E is a type variable.
  *
  * Each class should have its own unique type variables, one for each type
  * parameter. A class with type parameters is said to be parameterized or
@@ skipping 157 matching lines @@
   DartType unalias(Compiler compiler) => this;
 
   int get hashCode => 1733;
 
   bool operator ==(other) => other is MalformedType;
 
   String toString() => name.slowToString();
 }
 
 class InterfaceType extends DartType {
-  final Element element;
+  final ClassElement element;
   final Link<DartType> typeArguments;
 
   InterfaceType(this.element,
                 [this.typeArguments = const Link<DartType>()]) {
     assert(invariant(element, element.isDeclaration));
   }
 
   TypeKind get kind => TypeKind.INTERFACE;
 
   SourceString get name => element.name;
@@ skipping 15 matching lines @@
       return new InterfaceType(element, newTypeArguments);
     }
     return this;
   }
 
   DartType unalias(Compiler compiler) => this;
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.add(name.slowToString());
-    if (!typeArguments.isEmpty) {
+    if (!isRaw) {
       sb.add('<');
       typeArguments.printOn(sb, ', ');
       sb.add('>');
     }
     return sb.toString();
   }
 
   int get hashCode {
     int hash = element.hashCode;
     for (Link<DartType> arguments = this.typeArguments;
          !arguments.isEmpty;
          arguments = arguments.tail) {
       int argumentHash = arguments.head != null ? arguments.head.hashCode : 0;
       hash = 17 * hash + 3 * argumentHash;
     }
     return hash;
   }
 
   bool operator ==(other) {
     if (other is !InterfaceType) return false;
     if (!identical(element, other.element)) return false;
     return typeArguments == other.typeArguments;
   }
 
-  InterfaceType asRaw() {
-    if (typeArguments.isEmpty) return this;
-    return new InterfaceType(element);
-  }
+  bool get isRaw => typeArguments.isEmpty || identical(this, element.rawType);
+
+  InterfaceType asRaw() => element.rawType;
 }
 
 class FunctionType extends DartType {
   final Element element;
   DartType returnType;
   Link<DartType> parameterTypes;
 
   FunctionType(DartType this.returnType, Link<DartType> this.parameterTypes,
                Element this.element) {
     assert(element == null || invariant(element, element.isDeclaration));
@@ skipping 96 matching lines @@
   DartType unalias(Compiler compiler) {
     // TODO(ahe): This should be [ensureResolved].
     compiler.resolveTypedef(element);
     // TODO(johnniwinther): Perform substitution on the unaliased type.
     return element.alias.unalias(compiler);
   }
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.add(name.slowToString());
-    if (!typeArguments.isEmpty) {
+    if (!isRaw) {
       sb.add('<');
       typeArguments.printOn(sb, ', ');
       sb.add('>');
     }
     return sb.toString();
   }
 
   int get hashCode => 17 * element.hashCode;
 
   bool operator ==(other) {
     if (other is !TypedefType) return false;
     if (!identical(element, other.element)) return false;
     return typeArguments == other.typeArguments;
   }
+
+  bool get isRaw => typeArguments.isEmpty || identical(this, element.rawType);
+
+  TypedefType asRaw() => element.rawType;
 }
 
 /**
  * Special type to hold the [dynamic] type. Used for correctly returning
  * 'dynamic' on [toString].
  */
 class DynamicType extends InterfaceType {
   DynamicType(ClassElement element) : super(element);
 
   String toString() => 'dynamic';
 }
 
 
 class Types {
   final Compiler compiler;
   // TODO(karlklose): should we have a class Void?
   final VoidType voidType;
-  final InterfaceType dynamicType;
+  final DynamicType dynamicType;
 
   Types(Compiler compiler, ClassElement dynamicElement)
     : this.with(compiler, dynamicElement,
                 new LibraryElement(new Script(null, null)));
 
   Types.with(Compiler this.compiler,
              ClassElement dynamicElement,
              LibraryElement library)
     : voidType = new VoidType(new VoidElement(library)),
       dynamicType = new DynamicType(dynamicElement) {
-    dynamicElement.type = dynamicType;
+      dynamicElement.rawType = dynamicElement.thisType = dynamicType;
   }
 
   /** Returns true if t is a subtype of s */
   bool isSubtype(DartType t, DartType s) {
     if (identical(t, s) ||
         identical(t, dynamicType) ||
         identical(s, dynamicType) ||
         identical(s.element, compiler.objectClass) ||
         identical(t.element, compiler.nullClass)) {
       return true;
     }
     t = t.unalias(compiler);
     s = s.unalias(compiler);
 
     if (t is VoidType) {
       return false;
-    } else if (t is MalformedType) {
+    } else if (t is MalformedType || s is MalformedType) {
+      // TODO(johnniwinther): Malformed types should be treated as dynamic and
+      // thus return true here.
       return false;
     } else if (t is InterfaceType) {
       if (s is !InterfaceType) return false;
       ClassElement tc = t.element;
       if (identical(tc, s.element)) return true;
       for (Link<DartType> supertypes = tc.allSupertypes;
            supertypes != null && !supertypes.isEmpty;
            supertypes = supertypes.tail) {
         DartType supertype = supertypes.head;
         if (identical(supertype.element, s.element)) return true;
@@ skipping 699 matching lines @@
   }
 
   DartType visitStringNode(StringNode node) {
     compiler.unimplemented('visitNode', node: node);
   }
 
   DartType visitLibraryDependency(LibraryDependency node) {
     compiler.unimplemented('visitNode', node: node);
   }
 }