Handle compile-time constness for conditionals and type literal calls.

sdk/lib/_internal/compiler/implementation/resolution/members.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 resolution;
 
 abstract class TreeElements {
   Element get currentElement;
   Set<Node> get superUses;
 
@@ skipping 459 matching lines @@
 
     SendSet send = tree.asSendSet();
     if (send != null) {
       // TODO(johnniwinther): Avoid analyzing initializers if
       // [Compiler.analyzeSignaturesOnly] is set.
       visitor.visit(send.arguments.head);
     } else if (element.modifiers.isConst()) {
       compiler.reportError(element, MessageKind.CONST_WITHOUT_INITIALIZER);
     }
 
+    visitor.addPostProcessAction(element, () {

[karlklose, 2013/10/02 11:08:55]

Add a TODO to check if we need a constant.

[Johnni Winther, 2013/10/02 12:39:33]

Reverted this change. The constant is only needed for top-level/static fields.

+      compiler.constantHandler.compileVariable(
+          element, isConst: element.modifiers.isConst());
+    });
+
     if (Elements.isStaticOrTopLevelField(element)) {
-      visitor.addPostProcessAction(element, () {
-        compiler.constantHandler.compileVariable(
-            element, isConst: element.modifiers.isConst());
-      });
       if (tree.asSendSet() != null) {
         if (!element.modifiers.isConst()) {
           // TODO(johnniwinther): Determine the const-ness eagerly to avoid
           // unnecessary registrations.
           compiler.backend.registerLazyField(visitor.mapping);
         }
       } else {
         compiler.enqueuer.resolution.registerInstantiatedClass(
             compiler.nullClass, visitor.mapping);
       }
@@ skipping 1939 matching lines @@
         compiler.backend.registerTypeVariableExpression(mapping);
         // Set the type of the node to [Type] to mark this send as a
         // type variable expression.
         mapping.setType(node, compiler.typeClass.computeType(compiler));
         world.registerTypeLiteral(target, mapping);
       } else if (target.impliesType() && !sendIsMemberAccess) {
         // Set the type of the node to [Type] to mark this send as a
         // type literal.
         mapping.setType(node, compiler.typeClass.computeType(compiler));
         world.registerTypeLiteral(target, mapping);
-        analyzeConstant(node);
+
+        // Don't try to make constants of calls to type literals.
+        analyzeConstant(node, isConst: !node.isCall);
       }
     }
 
     bool resolvedArguments = false;
     if (node.isOperator) {
       String operatorString = node.selector.asOperator().source.stringValue;
       if (identical(operatorString, 'is')) {
         DartType type =
             resolveTypeExpression(node.typeAnnotationFromIsCheckOrCast);
         if (type != null) {
@@ skipping 430 matching lines @@
     } else if (isMirrorsUsedConstant) {
       compiler.mirrorUsageAnalyzerTask.validate(node, mapping);
     }
     if (node.isConst()) {
       analyzeConstant(node);
     }
 
     return null;
   }
 
-  void analyzeConstant(Node node) {
+  void analyzeConstant(Node node, {bool isConst: true}) {
     addPostProcessAction(enclosingElement, () {
-      mapping.setConstant(node,
-          compiler.constantHandler.compileNodeWithDefinitions(
-              node, mapping, isConst: true));
+       compiler.constantHandler.compileNodeWithDefinitions(
+           node, mapping, isConst: isConst);
     });
   }
 
   bool validateSymbol(Node node, String name, {bool reportError: true}) {
     if (name.isEmpty) return true;
     if (name.startsWith('_')) {
       if (reportError) {
         compiler.reportError(node, MessageKind.PRIVATE_IDENTIFIER,
                              {'value': name});
       }
@@ skipping 1573 matching lines @@
     return e;
   }
 
   /// Assumed to be called by [resolveRedirectingFactory].
   Element visitReturn(Return node) {
     Node expression = node.expression;
     return finishConstructorReference(visit(expression),
                                       expression, expression);
   }
 }