Use entities in constant_emitter

pkg/compiler/lib/src/js_backend/constant_emitter.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.
 
 import '../common.dart';
 import '../common_elements.dart';
 import '../constants/values.dart';
-import '../elements/elements.dart';
-import '../elements/types.dart' show TypeVariableType;
 import '../elements/entities.dart';
-import '../elements/resolution_types.dart';
+import '../elements/resolution_types.dart' show ResolutionTypedefType;
+import '../elements/types.dart';
 import '../io/code_output.dart';
 import '../js/js.dart' as jsAst;
 import '../js/js.dart' show js;
 import '../js_emitter/code_emitter_task.dart';
 import '../options.dart';
 import '../universe/world_builder.dart';
 import 'constant_system_javascript.dart';
 import 'js_backend.dart';
 import 'namer.dart';
 import 'runtime_types.dart';
@@ skipping 196 matching lines @@
         jsAst.Expression keyExpression =
             constantReferenceGenerator(constant.keys[i]);
         jsAst.Expression valueExpression =
             constantReferenceGenerator(constant.values[i]);
         data.add(keyExpression);
         data.add(valueExpression);
       }
       return new jsAst.ArrayInitializer(data);
     }
 
-    ClassElement classElement = constant.type.element;
+    ClassEntity classElement = constant.type.element;
     String className = classElement.name;
 
     List<jsAst.Expression> arguments = <jsAst.Expression>[];
 
     // The arguments of the JavaScript constructor for any given Dart class
     // are in the same order as the members of the class element.
     int emittedArgumentCount = 0;
-    classElement.implementation.forEachInstanceField(
-        (ClassElement enclosing, Element field) {
+    _worldBuilder.forEachInstanceField(classElement,
+        (ClassEntity enclosing, FieldEntity field) {
       if (field.name == JavaScriptMapConstant.LENGTH_NAME) {
         arguments
             .add(new jsAst.LiteralNumber('${constant.keyList.entries.length}'));
       } else if (field.name == JavaScriptMapConstant.JS_OBJECT_NAME) {
         arguments.add(jsMap());
       } else if (field.name == JavaScriptMapConstant.KEYS_NAME) {
         arguments.add(constantReferenceGenerator(constant.keyList));
       } else if (field.name == JavaScriptMapConstant.PROTO_VALUE) {
         assert(constant.protoValue != null);
         arguments.add(constantReferenceGenerator(constant.protoValue));
       } else if (field.name == JavaScriptMapConstant.JS_DATA_NAME) {
         arguments.add(jsGeneralMap());
       } else {
         failedAt(field,
             "Compiler has unexpected field ${field.name} for ${className}.");
       }
       emittedArgumentCount++;
-    }, includeSuperAndInjectedMembers: true);
+    });
     if ((className == JavaScriptMapConstant.DART_STRING_CLASS &&
             emittedArgumentCount != 3) ||
         (className == JavaScriptMapConstant.DART_PROTO_CLASS &&
             emittedArgumentCount != 4) ||
         (className == JavaScriptMapConstant.DART_GENERAL_CLASS &&
             emittedArgumentCount != 1)) {
       failedAt(classElement,
           "Compiler and ${className} disagree on number of fields.");
     }
 
     if (_rtiNeed.classNeedsRtiField(classElement)) {
       arguments.add(_reifiedTypeArguments(constant.type));
     }
 
     jsAst.Expression constructor = _emitter.constructorAccess(classElement);
     jsAst.Expression value = new jsAst.New(constructor, arguments);
     return value;
   }
 
-  jsAst.PropertyAccess getHelperProperty(MethodElement helper) {
+  jsAst.PropertyAccess getHelperProperty(FunctionEntity helper) {
     return _emitter.staticFunctionAccess(helper);
   }
 
   @override
   jsAst.Expression visitType(TypeConstantValue constant, [_]) {
-    ResolutionDartType type = constant.representedType;
-    jsAst.Name typeName = _namer.runtimeTypeName(type.element);
+    DartType type = constant.representedType;
+    jsAst.Name typeName;
+    Entity element;
+    if (type is InterfaceType) {
+      element = type.element;
+    } else if (type is ResolutionTypedefType) {
+      // TODO(redemption): Handle typedef type literals from .dill.
+      element = type.element;
+    } else {
+      assert(type is DynamicType);
+    }
+    typeName = _namer.runtimeTypeName(element);
     return new jsAst.Call(getHelperProperty(_commonElements.createRuntimeType),
         [js.quoteName(typeName)]);
   }
 
   @override
   jsAst.Expression visitInterceptor(InterceptorConstantValue constant, [_]) {
     ClassEntity interceptorClass = constant.cls;
     return _task.interceptorPrototypeAccess(interceptorClass);
   }
 
@@ skipping 31 matching lines @@
     }
     jsAst.New instantiation = new jsAst.New(constructor, fields);
     return instantiation;
   }
 
   String stripComments(String rawJavaScript) {
     return rawJavaScript.replaceAll(COMMENT_RE, '');
   }
 
   jsAst.Expression maybeAddTypeArguments(
-      ResolutionInterfaceType type, jsAst.Expression value) {
-    if (type is ResolutionInterfaceType &&
+      InterfaceType type, jsAst.Expression value) {
+    if (type is InterfaceType &&
         !type.treatAsRaw &&
         _rtiNeed.classNeedsRti(type.element)) {
       return new jsAst.Call(
           getHelperProperty(_commonElements.setRuntimeTypeInfo),
           [value, _reifiedTypeArguments(type)]);
     }
     return value;
   }
 
-  jsAst.Expression _reifiedTypeArguments(ResolutionInterfaceType type) {
+  jsAst.Expression _reifiedTypeArguments(InterfaceType type) {
     jsAst.Expression unexpected(TypeVariableType _variable) {
-      ResolutionTypeVariableType variable = _variable;
+      TypeVariableType variable = _variable;
       throw failedAt(
           NO_LOCATION_SPANNABLE,
-          "Unexpected type variable '${variable.getStringAsDeclared(null)}'"
-          " in constant type '${type.getStringAsDeclared(null)}'");
+          "Unexpected type variable '${variable}'"
+          " in constant type '${type}'");
     }
 
     List<jsAst.Expression> arguments = <jsAst.Expression>[];
-    for (ResolutionDartType argument in type.typeArguments) {
+    for (DartType argument in type.typeArguments) {
       arguments.add(
           _rtiEncoder.getTypeRepresentation(_emitter, argument, unexpected));
     }
     return new jsAst.ArrayInitializer(arguments);
   }
 
   @override
   jsAst.Expression visitDeferred(DeferredConstantValue constant, [_]) {
     return constantReferenceGenerator(constant.referenced);
   }
 }