Refactor ConstantSystem

pkg/compiler/lib/src/js_backend/constant_system_javascript.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.constant_system.js;
 
-import '../compiler.dart' show Compiler;
+import '../common/backend_api.dart' show BackendClasses;
 import '../constant_system_dart.dart';
 import '../constants/constant_system.dart';
 import '../constants/values.dart';
 import '../core_types.dart' show CommonElements;
-import '../elements/resolution_types.dart';
-import '../elements/elements.dart' show ClassElement, FieldElement;
+import '../elements/types.dart';
+import '../elements/resolution_types.dart' show DartTypes;
+import '../elements/entities.dart';
 import '../tree/dartstring.dart' show DartString, LiteralDartString;
-import 'js_backend.dart';
 
 const JAVA_SCRIPT_CONSTANT_SYSTEM = const JavaScriptConstantSystem();
 
 class JavaScriptBitNotOperation extends BitNotOperation {
   const JavaScriptBitNotOperation();
 
   ConstantValue fold(ConstantValue constant) {
     if (JAVA_SCRIPT_CONSTANT_SYSTEM.isInt(constant)) {
       // In JavaScript we don't check for -0 and treat it as if it was zero.
       if (constant.isMinusZero) constant = DART_CONSTANT_SYSTEM.createInt(0);
@@ skipping 280 matching lines @@
   NumConstantValue createDouble(double d) =>
       convertToJavaScriptConstant(new DoubleConstantValue(d));
   StringConstantValue createString(DartString string) {
     return new StringConstantValue(string);
   }
 
   BoolConstantValue createBool(bool value) => new BoolConstantValue(value);
   NullConstantValue createNull() => new NullConstantValue();
 
   @override
-  ListConstantValue createList(
-      ResolutionInterfaceType type, List<ConstantValue> values) {
+  ListConstantValue createList(InterfaceType type, List<ConstantValue> values) {
     return new ListConstantValue(type, values);
   }
 
   @override
-  ConstantValue createType(Compiler compiler, ResolutionDartType type) {
-    ResolutionInterfaceType instanceType =
-        compiler.backend.backendClasses.typeType;
+  ConstantValue createType(CommonElements commonElements,
+      BackendClasses backendClasses, DartType type) {
+    InterfaceType instanceType = backendClasses.typeType;
     return new TypeConstantValue(type, instanceType);
   }
 
   // Integer checks report true for -0.0, INFINITY, and -INFINITY.  At
   // runtime an 'X is int' check is implemented as:
   //
   // typeof(X) === "number" && Math.floor(X) === X
   //
   // We consistently match that runtime semantics at compile time as well.
   bool isInt(ConstantValue constant) {
     return constant.isInt ||
         constant.isMinusZero ||
         constant.isPositiveInfinity ||
         constant.isNegativeInfinity;
   }
 
   bool isDouble(ConstantValue constant) =>
       constant.isDouble && !constant.isMinusZero;
   bool isString(ConstantValue constant) => constant.isString;
   bool isBool(ConstantValue constant) => constant.isBool;
   bool isNull(ConstantValue constant) => constant.isNull;
 
-  bool isSubtype(DartTypes types, ResolutionDartType s, ResolutionDartType t) {
+  bool isSubtype(DartTypes types, DartType s, DartType t) {
     // At runtime, an integer is both an integer and a double: the
     // integer type check is Math.floor, which will return true only
     // for real integers, and our double type check is 'typeof number'
     // which will return true for both integers and doubles.
     if (s == types.commonElements.intType &&
         t == types.commonElements.doubleType) {
       return true;
     }
     return types.isSubtype(s, t);
   }
 
   MapConstantValue createMap(
-      Compiler compiler,
-      ResolutionInterfaceType sourceType,
+      CommonElements commonElements,
+      BackendClasses backendClasses,
+      InterfaceType sourceType,
       List<ConstantValue> keys,
       List<ConstantValue> values) {
-    JavaScriptBackend backend = compiler.backend;
-    CommonElements commonElements = compiler.commonElements;
-
     bool onlyStringKeys = true;
     ConstantValue protoValue = null;
     for (int i = 0; i < keys.length; i++) {
       var key = keys[i];
       if (key.isString) {
         if (key.primitiveValue == JavaScriptMapConstant.PROTO_PROPERTY) {
           protoValue = values[i];
         }
       } else {
         onlyStringKeys = false;
         // Don't handle __proto__ values specially in the general map case.
         protoValue = null;
         break;
       }
     }
 
     bool hasProtoKey = (protoValue != null);
-    ResolutionInterfaceType keysType;
+    InterfaceType keysType;
     if (sourceType.treatAsRaw) {
       keysType = commonElements.listType();
     } else {
       keysType = commonElements.listType(sourceType.typeArguments.first);
     }
     ListConstantValue keysList = new ListConstantValue(keysType, keys);
-    ClassElement classElement = onlyStringKeys
-        ? (hasProtoKey
-            ? backend.helpers.constantProtoMapClass
-            : backend.helpers.constantStringMapClass)
-        : backend.helpers.generalConstantMapClass;
-    classElement.ensureResolved(compiler.resolution);
-    List<ResolutionDartType> typeArgument = sourceType.typeArguments;
-    ResolutionInterfaceType type;
-    if (sourceType.treatAsRaw) {
-      type = classElement.rawType;
-    } else {
-      type = new ResolutionInterfaceType(classElement, typeArgument);
-    }
+    InterfaceType type = backendClasses.getConstantMapTypeFor(sourceType,
+        hasProtoKey: hasProtoKey, onlyStringKeys: onlyStringKeys);
     return new JavaScriptMapConstant(
         type, keysList, values, protoValue, onlyStringKeys);
   }
 
   @override
-  ConstantValue createSymbol(Compiler compiler, String text) {
-    // TODO(johnniwinther): Create a backend agnostic value.
-    JavaScriptBackend backend = compiler.backend;
-    ClassElement symbolClass = backend.helpers.symbolImplementationClass;
-    ResolutionInterfaceType type = symbolClass.rawType;
+  ConstantValue createSymbol(CommonElements commonElements,
+      BackendClasses backendClasses, String text) {
+    InterfaceType type = backendClasses.symbolType;
+    FieldEntity field = backendClasses.symbolField;
     ConstantValue argument = createString(new DartString.literal(text));
-    Map<FieldElement, ConstantValue> fields = <FieldElement, ConstantValue>{};
-    symbolClass.forEachInstanceField(
-        (ClassElement enclosingClass, FieldElement field) {
-      fields[field] = argument;

[Siggi Cherem (dart-lang), 2017/02/09 20:22:19]

(btw, much better now that we explicitly call out _name and not assume the
layout of the symbol class)

-    }, includeSuperAndInjectedMembers: true);
-    assert(fields.length == 1);
+    // TODO(johnniwinther): Use type arguments when all uses no longer expect
+    // a [FieldElement].
+    Map<FieldEntity, ConstantValue> fields = /*<FieldElement, ConstantValue>*/ {
+      field: argument
+    };
     return new ConstructedConstantValue(type, fields);
   }
 }
 
 class JavaScriptMapConstant extends MapConstantValue {
   /**
    * The [PROTO_PROPERTY] must not be used as normal property in any JavaScript
    * object. It would change the prototype chain.
    */
   static const LiteralDartString PROTO_PROPERTY =
       const LiteralDartString("__proto__");
 
   /** The dart class implementing constant map literals. */
   static const String DART_CLASS = "ConstantMap";
   static const String DART_STRING_CLASS = "ConstantStringMap";
   static const String DART_PROTO_CLASS = "ConstantProtoMap";
   static const String DART_GENERAL_CLASS = "GeneralConstantMap";
   static const String LENGTH_NAME = "_length";
   static const String JS_OBJECT_NAME = "_jsObject";
   static const String KEYS_NAME = "_keys";
   static const String PROTO_VALUE = "_protoValue";
   static const String JS_DATA_NAME = "_jsData";
 
   final ListConstantValue keyList;
   final ConstantValue protoValue;
   final bool onlyStringKeys;
 
-  JavaScriptMapConstant(ResolutionInterfaceType type, ListConstantValue keyList,
+  JavaScriptMapConstant(InterfaceType type, ListConstantValue keyList,
       List<ConstantValue> values, this.protoValue, this.onlyStringKeys)
       : this.keyList = keyList,
         super(type, keyList.entries, values);
   bool get isMap => true;
 
   List<ConstantValue> getDependencies() {
     List<ConstantValue> result = <ConstantValue>[];
     if (onlyStringKeys) {
       result.add(keyList);
     } else {
       // Add the keys individually to avoid generating an unused list constant
       // for the keys.
       result.addAll(keys);
     }
     result.addAll(values);
     return result;
   }
 }