dart2js: Remove oldEmitter field in emitter-task.

pkg/dart2js_incremental/lib/library_updater.dart

 // Copyright (c) 2014, 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_incremental.library_updater;
 
 import 'dart:async' show
     Future;
 
 import 'dart:convert' show
@@ skipping 45 matching lines @@
 import 'package:compiler/src/js/js.dart' show
     js;
 
 import 'package:compiler/src/js/js.dart' as jsAst;
 
 import 'package:compiler/src/js_emitter/js_emitter.dart' show
     ClassBuilder,
     ClassEmitter,
     CodeEmitterTask,
     ContainerBuilder,
+    OldEmitter,
     MemberInfo,
     computeMixinClass;
 
 import 'package:compiler/src/js_emitter/model.dart' show
     Class,
     Method;
 
 import 'package:compiler/src/js_emitter/program_builder/program_builder.dart'
     show ProgramBuilder;
 
@@ skipping 814 matching lines @@
         compiler.backend.constants.compiledConstants);
     newConstants.removeAll(_compiledConstants);
 
     if (!newConstants.isEmpty) {
       _ensureAllNeededEntitiesComputed();
       List<ConstantValue> constants =
           emitter.outputConstantLists[compiler.deferredLoadTask.mainOutputUnit];
       if (constants != null) {
         for (ConstantValue constant in constants) {
           if (!_compiledConstants.contains(constant)) {
+            OldEmitter fullEmitter = emitter.emitter;
             jsAst.Statement constantInitializer =
-                emitter.oldEmitter.buildConstantInitializer(constant)
-                .toStatement();
+                fullEmitter.buildConstantInitializer(constant).toStatement();
             updates.add(constantInitializer);
           }
         }
       }
     }
 
     updates.add(js.statement(r'''
 if (this.pendingStubs) {
   this.pendingStubs.map(function(e) { return e(); });
   this.pendingStubs = void 0;
@@ skipping 56 matching lines @@
   }
 
   List<jsAst.Statement> computeFieldUpdateJs(FieldElementX element) {
     if (element.isInstanceMember) {
       // Any initializers are inlined in factory methods, and the field is
       // declared by adding its class to [_classesWithSchemaChanges].
       return const <jsAst.Statement>[];
     }
     // A static (or top-level) field.
     if (backend.constants.lazyStatics.contains(element)) {
+      OldEmitter fullEmitter = emitter.emitter;
       jsAst.Expression init =
-          emitter.oldEmitter.buildLazilyInitializedStaticField(
+          fullEmitter.buildLazilyInitializedStaticField(
               element, isolateProperties: namer.currentIsolate);
       if (init == null) {
         throw new StateError("Initializer optimized away for $element");
       }
       return <jsAst.Statement>[init.toStatement()];
     } else {
       // TODO(ahe): When a field is referenced it is enqueued. If the field has
       // no initializer, it will not have any associated code, so it will
       // appear as if it was newly enqueued.
       if (element.initializer == null) {
@@ skipping 472 matching lines @@
 
 abstract class JsFeatures {
   Compiler get compiler;
 
   JavaScriptBackend get backend => compiler.backend;
 
   Namer get namer => backend.namer;
 
   CodeEmitterTask get emitter => backend.emitter;
 
-  ContainerBuilder get containerBuilder => emitter.oldEmitter.containerBuilder;
+  ContainerBuilder get containerBuilder {
+    OldEmitter fullEmitter = emitter.emitter;
+    return fullEmitter.containerBuilder;
+  }
 
   EnqueueTask get enqueuer => compiler.enqueuer;
 }
 
 class EmitterHelper extends JsFeatures {
   final Compiler compiler;
 
   EmitterHelper(this.compiler);
 
-  ClassEmitter get classEmitter => backend.emitter.oldEmitter.classEmitter;
+  ClassEmitter get classEmitter {
+    OldEmitter fullEmitter = emitter.emitter;
+    return fullEmitter.classEmitter;
+  }
 
   List<String> computeFields(ClassElement classElement) {
     Class cls = new ProgramBuilder(compiler, namer, emitter)
         .buildFieldsHackForIncrementalCompilation(classElement);
     // TODO(ahe): Rewrite for new emitter.
     ClassBuilder builder = new ClassBuilder(classElement, namer);
     classEmitter.emitFields(cls, builder);
     return builder.fields;
   }
 }
 
 // TODO(ahe): Remove this method.
 NO_WARN(x) => x;