Revert "Emit constants using ASTs"

sdk/lib/_internal/compiler/implementation/js_backend/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.
 
 part of js_backend;
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
@@ skipping 63 matching lines @@
   }
 
   void computeRequiredTypeChecks() {
     assert(checkedClasses == null);
     checkedClasses = new Set<ClassElement>();
     compiler.codegenWorld.isChecks.forEach((DartType t) {
       if (t is InterfaceType) checkedClasses.add(t.element);
     });
   }
 
-  js.Expression constantReference(Constant value) {
-    return constantEmitter.reference(value);
-  }
-
-  js.Expression constantInitializerExpression(Constant value) {
-    return constantEmitter.initializationExpression(value);
-  }
-
-  // Deprecated.  Remove after last use is converted to JS ASTs.
-  void writeConstantToBuffer(Constant value, CodeBuffer buffer) {
-    buffer.add(js.prettyPrint(constantReference(value), compiler));
+  void writeConstantToBuffer(Constant value, CodeBuffer buffer,
+                             {emitCanonicalVersion: true}) {
+    if (emitCanonicalVersion) {
+      constantEmitter.emitCanonicalVersionOfConstant(value, buffer);
+    } else {
+      constantEmitter.emitJavaScriptCodeForConstant(value, buffer);
+    }
   }
 
   String get name => 'CodeEmitter';
 
   String get defineClassName
       => '${namer.ISOLATE}.\$defineClass';
   String get finishClassesName
       => '${namer.ISOLATE}.\$finishClasses';
   String get finishIsolateConstructorName
       => '${namer.ISOLATE}.\$finishIsolateConstructor';
@@ skipping 1211 matching lines @@
         defineInstanceMember(invocationName, getterBuffer);
       }
     }
   }
 
   void emitStaticNonFinalFieldInitializations(CodeBuffer buffer) {
     ConstantHandler handler = compiler.constantHandler;
     List<VariableElement> staticNonFinalFields =
         handler.getStaticNonFinalFieldsForEmission();
     for (Element element in staticNonFinalFields) {
+      buffer.add('$isolateProperties.${namer.getName(element)} = ');
       compiler.withCurrentElement(element, () {
-        Constant initialValue = handler.getInitialValueFor(element);
-        js.Expression init =
-            new js.Assignment(
-                new js.PropertyAccess.field(
-                    new js.VariableUse(isolateProperties),
-                    namer.getName(element)),
-                constantEmitter.referenceInInitializationContext(initialValue));
-        buffer.add(js.prettyPrint(init, compiler));
-        buffer.add(';\n');
-      });
+          Constant initialValue = handler.getInitialValueFor(element);
+          writeConstantToBuffer(initialValue, buffer);
+        });
+      buffer.add(';\n');
     }
   }
 
   void emitLazilyInitializedStaticFields(CodeBuffer buffer) {
     ConstantHandler handler = compiler.constantHandler;
     List<VariableElement> lazyFields =
         handler.getLazilyInitializedFieldsForEmission();
     if (!lazyFields.isEmpty) {
       needsLazyInitializer = true;
       for (VariableElement element in lazyFields) {
@@ skipping 37 matching lines @@
 
       String name = namer.constantName(constant);
       // The name is null when the constant is already a JS constant.
       // TODO(floitsch): every constant should be registered, so that we can
       // share the ones that take up too much space (like some strings).
       if (name == null) continue;
       if (!addedMakeConstantList && constant.isList()) {
         addedMakeConstantList = true;
         emitMakeConstantList(buffer);
       }
-      js.Expression init =
-          new js.Assignment(
-              new js.PropertyAccess.field(
-                  new js.VariableUse(isolateProperties),
-                  name),
-              constantInitializerExpression(constant));
-      buffer.add(js.prettyPrint(init, compiler));
+      buffer.add('$isolateProperties.$name = ');
+      writeConstantToBuffer(constant, buffer, emitCanonicalVersion: false);
       buffer.add(';\n');
     }
   }
 
   void emitMakeConstantList(CodeBuffer buffer) {
     buffer.add(namer.ISOLATE);
     buffer.add(r'''.makeConstantList = function(list) {
   list.immutable$list = true;
   list.fixed$length = true;
   return list;
@@ skipping 407 matching lines @@
 const String HOOKS_API_USAGE = """
 // Generated by dart2js, the Dart to JavaScript compiler.
 // The code supports the following hooks:
 // dartPrint(message)   - if this function is defined it is called
 //                        instead of the Dart [print] method.
 // dartMainRunner(main) - if this function is defined, the Dart [main]
 //                        method will not be invoked directly.
 //                        Instead, a closure that will invoke [main] is
 //                        passed to [dartMainRunner].
 """;