dart2js: Remove oldEmitter field in emitter-task.

pkg/dart2js_incremental/lib/caching_compiler.dart

 // Copyright (c) 2013, 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 dart2js_incremental;
 
 /// Do not call this method directly. It will be made private.
 // TODO(ahe): Make this method private.
 Future<Compiler> reuseCompiler(
     {DiagnosticHandler diagnosticHandler,
@@ skipping 47 matching lines @@
         outputProvider,
         diagnosticHandler,
         libraryRoot,
         packageRoot,
         options,
         environment,
         null,
         null);
     JavaScriptBackend backend = compiler.backend;
 
+    OldEmitter emitter = backend.emitter.emitter;
+
     // Much like a scout, an incremental compiler is always prepared. For
     // mixins, classes, and lazy statics, at least.
-    backend.emitter.oldEmitter
+    emitter
         ..needsClassSupport = true
         ..needsMixinSupport = true
         ..needsLazyInitializer = true
         ..needsStructuredMemberInfo = true;
 
     Uri core = Uri.parse("dart:core");
     return compiler.libraryLoader.loadLibrary(core).then((_) {
       // Likewise, always be prepared for runtimeType support.
       // TODO(johnniwinther): Add global switch to force RTI.
       compiler.enabledRuntimeType = true;
@@ skipping 12 matching lines @@
         ..provider = inputProvider
         ..handler = diagnosticHandler
         ..enqueuer.resolution.queueIsClosed = false
         ..enqueuer.resolution.hasEnqueuedReflectiveElements = false
         ..enqueuer.resolution.hasEnqueuedReflectiveStaticFields = false
         ..enqueuer.codegen.queueIsClosed = false
         ..enqueuer.codegen.hasEnqueuedReflectiveElements = false
         ..enqueuer.codegen.hasEnqueuedReflectiveStaticFields = false
         ..compilationFailed = false;
     JavaScriptBackend backend = compiler.backend;
+    OldEmitter emitter = backend.emitter.emitter;
 
     // TODO(ahe): Seems this cache only serves to tell
-    // [OldEmitter.invalidateCaches] if it was invoked on a full compile (in
+    // [emitter.invalidateCaches] if it was invoked on a full compile (in
     // which case nothing should be invalidated), or if it is an incremental
     // compilation (in which case, holders/owners of newly compiled methods
     // must be invalidated).
-    backend.emitter.oldEmitter.cachedElements.add(null);
+    emitter.cachedElements.add(null);
 
     compiler.enqueuer.codegen
         ..newlyEnqueuedElements.clear()
         ..newlySeenSelectors.clear();
 
-    backend.emitter.oldEmitter.nsmEmitter
+    emitter.nsmEmitter
         ..trivialNsmHandlers.clear();
 
     backend.emitter.typeTestRegistry
         ..checkedClasses = null
         ..checkedFunctionTypes = null
         ..rtiNeededClasses.clear()
         ..cachedClassesUsingTypeVariableTests = null;
 
-    backend.emitter.oldEmitter.interceptorEmitter
+    emitter.interceptorEmitter
         ..interceptorInvocationNames.clear();
 
     backend.emitter.nativeEmitter
         ..hasNativeClasses = false
         ..nativeMethods.clear();
 
     backend.emitter.readTypeVariables.clear();
 
-    backend.emitter.oldEmitter
+    emitter
         ..outputBuffers.clear()
         ..classesCollector = null
         ..mangledFieldNames.clear()
         ..mangledGlobalFieldNames.clear()
         ..recordedMangledNames.clear()
         ..clearCspPrecompiledNodes()
         ..elementDescriptors.clear();
 
     backend
         ..preMirrorsMethodCount = 0;
@@ skipping 42 matching lines @@
   final Map<String, String> output = new Map<String, String>();
 
   EventSink<String> call(String name, String extension) {
     return new StringEventSink((String data) {
       output['$name.$extension'] = data;
     });
   }
 
   String operator[] (String key) => output[key];
 }