Remove Enqueuer.nativeEnqueuer

pkg/compiler/lib/src/js_backend/enqueuer.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.js.enqueue;
 
 import 'dart:collection' show Queue;
 
 import '../common/codegen.dart' show CodegenWorkItem;
 import '../common/tasks.dart' show CompilerTask;
 import '../common/work.dart' show WorkItem;
 import '../common.dart';
 import '../elements/resolution_types.dart'
     show ResolutionDartType, ResolutionInterfaceType;
-import '../elements/elements.dart' show MemberElement, TypedElement;
+import '../elements/elements.dart' show MemberElement;
 import '../elements/entities.dart';
 import '../enqueue.dart';
 import '../js_backend/backend.dart' show JavaScriptBackend;
-import '../native/native.dart' as native;
 import '../options.dart';
 import '../types/types.dart' show TypeMaskStrategy;
 import '../universe/world_builder.dart';
 import '../universe/use.dart'
     show DynamicUse, StaticUse, StaticUseKind, TypeUse, TypeUseKind;
 import '../universe/world_impact.dart'
     show ImpactUseCase, WorldImpact, WorldImpactVisitor;
 import '../util/enumset.dart';
 import '../util/util.dart' show Setlet;
 
 /// [Enqueuer] which is specific to code generation.
 class CodegenEnqueuer extends EnqueuerImpl {
   final String name;
   final EnqueuerStrategy strategy;
 
   Set<ClassEntity> _recentClasses = new Setlet<ClassEntity>();
   final CodegenWorldBuilderImpl _universe;
   final WorkItemBuilder _workItemBuilder;
 
   bool queueIsClosed = false;
   final CompilerTask task;
-  final native.NativeEnqueuer nativeEnqueuer;
   final EnqueuerListener listener;
   final CompilerOptions _options;
 
   WorldImpactVisitor _impactVisitor;
 
   final Queue<WorkItem> _queue = new Queue<WorkItem>();
 
   /// All declaration elements that have been processed by codegen.
   final Set<Entity> _processedEntities = new Set<Entity>();
 
   static const ImpactUseCase IMPACT_USE =
       const ImpactUseCase('CodegenEnqueuer');
 
   CodegenEnqueuer(this.task, JavaScriptBackend backend, CompilerOptions options,
       this.strategy)
       : _universe =
             new CodegenWorldBuilderImpl(backend, const TypeMaskStrategy()),
         _workItemBuilder = new CodegenWorkItemBuilder(backend, options),
-        nativeEnqueuer = backend.nativeCodegenEnqueuer(),
         this.listener = backend.codegenEnqueuerListener,
         this._options = options,
         this.name = 'codegen enqueuer' {
     _impactVisitor = new EnqueuerImplImpactVisitor(this);
   }
 
   CodegenWorldBuilder get worldBuilder => _universe;
 
   bool get queueIsEmpty => _queue.isEmpty;
 
@@ skipping 29 matching lines @@
     if (worldImpact.isEmpty) return;
     impactStrategy.visitImpact(
         impactSource, worldImpact, _impactVisitor, impactUse);
   }
 
   void _registerInstantiatedType(ResolutionInterfaceType type,
       {bool mirrorUsage: false, bool nativeUsage: false}) {
     task.measure(() {
       _universe.registerTypeInstantiation(type, _applyClassUse,
           byMirrors: mirrorUsage);
-      if (nativeUsage) {
-        nativeEnqueuer.onInstantiatedType(type);
-      }
-      listener.registerInstantiatedType(type);
+      listener.registerInstantiatedType(type, nativeUsage: nativeUsage);
     });
   }
 
   bool checkNoEnqueuedInvokedInstanceMethods() {
     return strategy.checkEnqueuerConsistency(this);
   }
 
   void checkClass(ClassEntity cls) {
     _universe.processClassMembers(cls, (MemberEntity member, useSet) {
       if (useSet.isNotEmpty) {
@@ skipping 109 matching lines @@
   /// [_onQueueEmpty] was called last. A return value of [true] indicates that
   /// the [recentClasses] have been processed and may be cleared. If [false] is
   /// returned, [_onQueueEmpty] will be called once the queue is empty again (or
   /// still empty) and [recentClasses] will be a superset of the current value.
   bool _onQueueEmpty(Iterable<ClassEntity> recentClasses) {
     return listener.onQueueEmpty(this, recentClasses);
   }
 
   void logSummary(log(message)) {
     log('Compiled ${_processedEntities.length} methods.');
-    nativeEnqueuer.logSummary(log);
+    listener.logSummary(log);
   }
 
   String toString() => 'Enqueuer($name)';
 
   ImpactUseCase get impactUse => IMPACT_USE;
 
   @override
   Iterable<Entity> get processedEntities => _processedEntities;
 
   @override
@@ skipping 19 matching lines @@
     // code for checked setters.
     if (element.isField && element.isInstanceMember) {
       if (!_options.enableTypeAssertions ||
           element.enclosingElement.isClosure) {
         return null;
       }
     }
     return new CodegenWorkItem(_backend, element);
   }
 }