dart2dart: Fixed treatment of dynamic type literals in new IR.

sdk/lib/_internal/compiler/implementation/ir/ir_builder.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.
 
 library dart2js.ir_builder;
 
 import 'ir_nodes.dart' as ir;
 import '../elements/elements.dart';
 import '../dart2jslib.dart';
 import '../dart_types.dart';
@@ skipping 1217 matching lines @@
     assert(isOpen);
     if (node.isPropertyAccess) {
       return visitGetterSend(node);
     } else {
       return visitDynamicSend(node);
     }
   }
 
   ir.Primitive visitTypeReferenceSend(ast.Send node) {
     assert(isOpen);
-    Element element = elements[node];
-    assert(element is TypeDeclarationElement || element.isTypeVariable);
-
     // If the user is trying to invoke the type literal or variable,
     // it must be treated as a function call.
     if (node.argumentsNode != null) {
       return visitDynamicSend(node);
     }
 
-    if (element is TypeDeclarationElement) {
-      return translateConstant(node);
-    } else {
-      ir.Primitive prim = new ir.ReifyTypeVar(element);
+    DartType type = elements.getTypeLiteralType(node);
+    if (type is TypeVariableType) {
+      ir.Primitive prim = new ir.ReifyTypeVar(type.element);
       add(new ir.LetPrim(prim));
       return prim;
+    } else {
+      return translateConstant(node);
     }
   }
 
   ir.Primitive visitSendSet(ast.SendSet node) {
     assert(isOpen);
     Element element = elements[node];
     ast.Operator op = node.assignmentOperator;
     // For complex operators, this is the result of getting (before assigning)
     ir.Primitive originalValue;
     // For []+= style operators, this saves the index.
@@ skipping 258 matching lines @@
     }
     if (Elements.isLocal(element) ||
         Elements.isStaticOrTopLevelField(element)) {
       // If the constant is small, inline it instead of using the declared const
       Constant value = constantCompiler.getConstantForVariable(element);
       if (isSmallConstant(value))
         return new PrimitiveConstExp(value);
       else
         return new VariableConstExp(element);
     }
-    if (Elements.isClass(element) || Elements.isTypedef(element)) {
-      return new TypeConstExp(element);
+    DartType type = elements.getTypeLiteralType(node);
+    if (type != null) {
+      return new TypeConstExp(type);
     }
     throw "Unexpected constant Send: $node";
   }
 
   ConstExp visitParenthesizedExpression(ast.ParenthesizedExpression node) {
     return visit(node.expression);
   }
 
   ConstExp visitLiteralList(ast.LiteralList node) {
     List<ConstExp> values = node.elements.nodes.mapToList(visit);
@@ skipping 39 matching lines @@
   ConstExp visitConditional(ast.Conditional node) {
     BoolConstant condition = computeConstant(node.condition);
     return visit(condition.isTrue ? node.thenExpression : node.elseExpression);
   }
 
   ConstExp visitNode(ast.Node node) {
     throw "Unexpected constant: $node";
   }
 
 }