Use isValidConst flag to distinguish between const / final expressions.

pkg/analyzer/lib/src/summary/summarize_const_expr.dart

 // Copyright (c) 2016, 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 serialization.summarize_const_expr;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
@@ skipping 28 matching lines @@
 }
 
 /**
  * Instances of this class keep track of intermediate state during
  * serialization of a single constant [Expression].
  */
 abstract class AbstractConstExprSerializer {
   /**
    * See [UnlinkedConstBuilder.isInvalid].
    */
-  bool isInvalid = false;
+  bool isValidConst = true;
 
   /**
    * See [UnlinkedConstBuilder.operations].
    */
   final List<UnlinkedConstOperation> operations = <UnlinkedConstOperation>[];
 
   /**
    * See [UnlinkedConstBuilder.assignmentOperators].
    */
   final List<UnlinkedExprAssignOperator> assignmentOperators =
@@ skipping 25 matching lines @@
    */
   bool isConstructorParameterName(String name);
 
   /**
    * Serialize the given [expr] expression into this serializer state.
    */
   void serialize(Expression expr) {
     try {
       _serialize(expr);
     } on StateError {
-      isInvalid = true;
+      isValidConst = false;
     }
   }
 
   /**
    * Serialize the given [annotation] into this serializer state.
    */
   void serializeAnnotation(Annotation annotation);
 
   /**
    * Return [EntityRefBuilder] that corresponds to the constructor having name
@@ skipping 23 matching lines @@
   /**
    * Return [EntityRefBuilder] that corresponds to the given [type].
    */
   EntityRefBuilder serializeType(TypeName type);
 
   /**
    * Return the [UnlinkedConstBuilder] that corresponds to the state of this
    * serializer.
    */
   UnlinkedConstBuilder toBuilder() {
-    if (isInvalid) {
-      return new UnlinkedConstBuilder(isInvalid: true);
-    }
     return new UnlinkedConstBuilder(
+        isValidConst: isValidConst,
         operations: operations,
         assignmentOperators: assignmentOperators,
         ints: ints,
         doubles: doubles,
         strings: strings,
         references: references);
   }
 
   /**
    * Push the operation for the given assignable [expr].
@@ skipping 65 matching lines @@
       operations.add(UnlinkedConstOperation.pushNull);
     } else if (expr is Identifier) {
       if (expr is SimpleIdentifier && isConstructorParameterName(expr.name)) {
         strings.add(expr.name);
         operations.add(UnlinkedConstOperation.pushConstructorParameter);
       } else {
         references.add(serializeIdentifier(expr));
         operations.add(UnlinkedConstOperation.pushReference);
       }
     } else if (expr is InstanceCreationExpression) {
+      if (!expr.isConst) {
+        isValidConst = false;
+      }
       serializeInstanceCreation(
           serializeConstructorName(
               expr.constructorName.type, expr.constructorName.name),
           expr.argumentList);
     } else if (expr is ListLiteral) {
       _serializeListLiteral(expr);
     } else if (expr is MapLiteral) {
       _serializeMapLiteral(expr);
     } else if (expr is MethodInvocation) {
       _serializeMethodInvocation(expr);
     } else if (expr is BinaryExpression) {
       _serializeBinaryExpression(expr);
     } else if (expr is ConditionalExpression) {
       _serialize(expr.condition);
       _serialize(expr.thenExpression);
       _serialize(expr.elseExpression);
       operations.add(UnlinkedConstOperation.conditional);
     } else if (expr is PrefixExpression) {
       _serializePrefixExpression(expr);
     } else if (expr is PostfixExpression) {
       _serializePostfixExpression(expr);
     } else if (expr is PropertyAccess) {
       _serializePropertyAccess(expr);
     } else if (expr is ParenthesizedExpression) {
       _serialize(expr.expression);
     } else if (expr is IndexExpression) {
+      isValidConst = false;
       _serialize(expr.target);
       _serialize(expr.index);
       operations.add(UnlinkedConstOperation.extractIndex);
     } else if (expr is AssignmentExpression) {
       _serializeAssignment(expr);
     } else if (expr is CascadeExpression) {
       _serializeCascadeExpression(expr);
     } else {
       throw new StateError('Unknown expression type: $expr');
     }
@@ skipping 11 matching lines @@
         _serialize(arg);
       }
     });
     // Add numbers of named and positional arguments, and the op-code.
     ints.add(argumentNames.length);
     strings.addAll(argumentNames);
     ints.add(arguments.length - argumentNames.length);
   }
 
   void _serializeAssignment(AssignmentExpression expr) {
+    isValidConst = false;
     // Push the value.
     _serialize(expr.rightHandSide);
     // Push the assignment operator.
     TokenType operator = expr.operator.type;
     UnlinkedExprAssignOperator assignmentOperator;
     if (operator == TokenType.EQ) {
       assignmentOperator = UnlinkedExprAssignOperator.assign;
     } else if (operator == TokenType.QUESTION_QUESTION_EQ) {
       assignmentOperator = UnlinkedExprAssignOperator.ifNull;
     } else if (operator == TokenType.STAR_EQ) {
@@ skipping 105 matching lines @@
         expr.typeArguments.arguments.length == 2) {
       references.add(serializeType(expr.typeArguments.arguments[0]));
       references.add(serializeType(expr.typeArguments.arguments[1]));
       operations.add(UnlinkedConstOperation.makeTypedMap);
     } else {
       operations.add(UnlinkedConstOperation.makeUntypedMap);
     }
   }
 
   void _serializeMethodInvocation(MethodInvocation invocation) {
+    if (invocation.target != null ||
+        invocation.methodName.name != 'identical') {
+      isValidConst = false;
+    }
     Expression target = invocation.target;
     SimpleIdentifier methodName = invocation.methodName;
     ArgumentList argumentList = invocation.argumentList;
     if (_isIdentifierSequence(methodName)) {
       EntityRefBuilder ref = serializeIdentifierSequence(methodName);
       references.add(ref);
       _serializeArguments(argumentList);
       operations.add(UnlinkedConstOperation.invokeMethodRef);
     } else {
       if (!invocation.isCascaded) {
@@ skipping 37 matching lines @@
     } else if (operator == TokenType.MINUS_MINUS) {
       _serializePrefixPostfixIncDec(
           operand, UnlinkedExprAssignOperator.prefixDecrement);
     } else {
       throw new StateError('Unknown operator: $operator');
     }
   }
 
   void _serializePrefixPostfixIncDec(
       Expression operand, UnlinkedExprAssignOperator operator) {
+    isValidConst = false;
     assignmentOperators.add(operator);
     _pushAssignable(operand);
   }
 
   void _serializePropertyAccess(PropertyAccess expr) {
     if (_isIdentifierSequence(expr)) {
       EntityRefBuilder ref = serializeIdentifierSequence(expr);
       references.add(ref);
       operations.add(UnlinkedConstOperation.pushReference);
     } else {
@@ skipping 49 matching lines @@
         expr = (expr as PrefixedIdentifier).prefix;
       } else if (expr is PropertyAccess) {
         expr = (expr as PropertyAccess).target;
       } else {
         return false;
       }
     }
     return false;
   }
 }