Refactor ConstantExpression/ConstantConstructor to use entities.

pkg/compiler/lib/src/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.
 
 library dart2js.resolution.members;
 
 import '../common.dart';
 import '../common/names.dart' show Selectors;
 import '../common/resolution.dart' show Resolution;
 import '../compile_time_constants.dart';
@@ skipping 2043 matching lines @@
 
     return handleUpdate(node, name, semantics);
   }
 
   /// Handle access to a type literal of a typedef. Like `F` or
   /// `F()` where 'F' is typedef.
   ResolutionResult handleTypedefTypeLiteralAccess(
       Send node, Name name, TypedefElement typdef) {
     typdef.ensureResolved(resolution);
     ResolutionDartType type = typdef.rawType;
-    ConstantExpression constant = new TypeConstantExpression(type);
+    ConstantExpression constant = new TypeConstantExpression(type, name.text);
     AccessSemantics semantics = new ConstantAccess.typedefTypeLiteral(constant);
     return handleConstantTypeLiteralAccess(node, name, typdef, type, semantics);
   }
 
   /// Handle access to a type literal of a typedef. Like `F = b`, `F++` or
   /// `F += b` where 'F' is typedef.
   ResolutionResult handleTypedefTypeLiteralUpdate(
       SendSet node, Name name, TypedefElement typdef) {
     typdef.ensureResolved(resolution);
     ResolutionDartType type = typdef.rawType;
-    ConstantExpression constant = new TypeConstantExpression(type);
+    ConstantExpression constant = new TypeConstantExpression(type, name.text);
     AccessSemantics semantics = new ConstantAccess.typedefTypeLiteral(constant);
     return handleConstantTypeLiteralUpdate(node, name, typdef, type, semantics);
   }
 
   /// Handle access to a type literal of the type 'dynamic'. Like `dynamic` or
   /// `dynamic()`.
   ResolutionResult handleDynamicTypeLiteralAccess(Send node) {
     ResolutionDartType type = const ResolutionDynamicType();
     ConstantExpression constant = new TypeConstantExpression(
         // TODO(johnniwinther): Use [type] when evaluation of constants is done
         // directly on the constant expressions.
-        node.isCall ? commonElements.typeType : type);
+        node.isCall ? commonElements.typeType : type,
+        'dynamic');
     AccessSemantics semantics = new ConstantAccess.dynamicTypeLiteral(constant);
     ClassElement typeClass = commonElements.typeClass;
     return handleConstantTypeLiteralAccess(
         node, const PublicName('dynamic'), typeClass, type, semantics);
   }
 
   /// Handle update to a type literal of the type 'dynamic'. Like `dynamic++` or
   /// `dynamic = 0`.
   ResolutionResult handleDynamicTypeLiteralUpdate(SendSet node) {
     ResolutionDartType type = const ResolutionDynamicType();
     ConstantExpression constant =
-        new TypeConstantExpression(const ResolutionDynamicType());
+        new TypeConstantExpression(const ResolutionDynamicType(), 'dynamic');
     AccessSemantics semantics = new ConstantAccess.dynamicTypeLiteral(constant);
     ClassElement typeClass = commonElements.typeClass;
     return handleConstantTypeLiteralUpdate(
         node, const PublicName('dynamic'), typeClass, type, semantics);
   }
 
   /// Handle access to a type literal of a class. Like `C` or
   /// `C()` where 'C' is class.
   ResolutionResult handleClassTypeLiteralAccess(
       Send node, Name name, ClassElement cls) {
     cls.ensureResolved(resolution);
     ResolutionDartType type = cls.rawType;
-    ConstantExpression constant = new TypeConstantExpression(type);
+    ConstantExpression constant = new TypeConstantExpression(type, name.text);
     AccessSemantics semantics = new ConstantAccess.classTypeLiteral(constant);
     return handleConstantTypeLiteralAccess(node, name, cls, type, semantics);
   }
 
   /// Handle access to a type literal of a class. Like `C = b`, `C++` or
   /// `C += b` where 'C' is class.
   ResolutionResult handleClassTypeLiteralUpdate(
       SendSet node, Name name, ClassElement cls) {
     cls.ensureResolved(resolution);
     ResolutionDartType type = cls.rawType;
-    ConstantExpression constant = new TypeConstantExpression(type);
+    ConstantExpression constant = new TypeConstantExpression(type, name.text);
     AccessSemantics semantics = new ConstantAccess.classTypeLiteral(constant);
     return handleConstantTypeLiteralUpdate(node, name, cls, type, semantics);
   }
 
   /// Handle a [Send] that resolves to a [prefix]. Like `prefix` in
   /// `prefix.Class` or `prefix` in `prefix()`, the latter being a compile time
   /// error.
   ResolutionResult handleClassSend(Send node, Name name, ClassElement cls) {
     cls.ensureResolved(resolution);
     if (sendIsMemberAccess) {
@@ skipping 410 matching lines @@
                       .functionDeclaration.parameters
                       .indexOf(parameter)),
                   element: element);
             }
           } else {
             result = new ElementResult(element);
           }
           break;
         case AccessKind.FINAL_LOCAL_VARIABLE:
           if (element.isConst) {
+            LocalVariableElement local = element;
             result = new ConstantResult(
-                node, new VariableConstantExpression(element),
+                node, new LocalVariableConstantExpression(local),
                 element: element);
           } else {
             result = new ElementResult(element);
           }
           break;
         default:
           reporter.internalError(node, "Unexpected local access $semantics.");
           break;
       }
       selector = new Selector.getter(name);
@@ skipping 174 matching lines @@
               MessageKind.UNDEFINED_STATIC_GETTER_BUT_SETTER, {'name': name});
           break;
         default:
           reporter.internalError(
               node, "Unexpected statically resolved access $semantics.");
           break;
       }
       registry.registerSendStructure(node, new GetStructure(semantics));
       if (member.isConst) {
         FieldElement field = member;
-        result = new ConstantResult(node, new VariableConstantExpression(field),
+        result = new ConstantResult(node, new FieldConstantExpression(field),
             element: field);
       } else {
         result = new ElementResult(member);
       }
     }
 
     // TODO(23998): Remove these when all information goes through
     // the [SendStructure].
     registry.useElement(node, member);
     registry.setSelector(node, selector);
@@ skipping 1213 matching lines @@
       // Callback hook for when the compile-time constant evaluator has
       // analyzed the constant.
       // TODO(johnniwinther): Remove this when all constants are computed
       // in resolution.
       Function onAnalyzed;
       if (isValidAsConstant &&
           argumentsResult.isValidAsConstant &&
           // TODO(johnniwinther): Remove this when all constants are computed
           // in resolution.
           !constructor.isFromEnvironmentConstructor) {
+        ResolutionInterfaceType interfaceType = type;
         CallStructure callStructure = argumentsResult.callStructure;
         List<ConstantExpression> arguments = argumentsResult.constantArguments;
 
         ConstructedConstantExpression constant =
             new ConstructedConstantExpression(
-                type, constructor, callStructure, arguments);
+                interfaceType, constructor, callStructure, arguments);
         registry.registerNewStructure(node,
             new ConstInvokeStructure(ConstantInvokeKind.CONSTRUCTED, constant));
         resolutionResult = new ConstantResult(node, constant);
       } else if (isInvalid) {
         // Known to be non-constant.
         kind == ConstructorAccessKind.NON_CONSTANT_CONSTRUCTOR;
         registry.registerNewStructure(
             node,
             new NewInvokeStructure(
                 new ConstructorAccessSemantics(kind, constructor, type),
@@ skipping 782 matching lines @@
     }
     return const NoneResult();
   }
 }
 
 /// Looks up [name] in [scope] and unwraps the result.
 Element lookupInScope(
     DiagnosticReporter reporter, Node node, Scope scope, String name) {
   return Elements.unwrap(scope.lookup(name), reporter, node);
 }