Move ElementEnvironment.isSubtype to DartTypes

pkg/compiler/lib/src/native/enqueue.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.
 
 import '../common_elements.dart' show CommonElements, ElementEnvironment;
 import '../elements/elements.dart';
 import '../elements/entities.dart';
 import '../elements/resolution_types.dart';
 import '../elements/types.dart';
 import '../js_backend/backend_usage.dart' show BackendUsageBuilder;
@@ skipping 33 matching lines @@
   final Set<ClassEntity> _registeredClasses = new Set<ClassEntity>();
   final Set<ClassEntity> _unusedClasses = new Set<ClassEntity>();
 
   bool get hasInstantiatedNativeClasses => !_registeredClasses.isEmpty;
 
   /// Log message reported if all native types are used.
   String _allUsedMessage;
 
   final CompilerOptions _options;
   final ElementEnvironment _elementEnvironment;
+  final DartTypes _dartTypes;
   final CommonElements _commonElements;
 
   /// Subclasses of [NativeEnqueuerBase] are constructed by the backend.
-  NativeEnqueuerBase(
-      this._options, this._elementEnvironment, this._commonElements);
+  NativeEnqueuerBase(this._options, this._elementEnvironment,
+      this._commonElements, this._dartTypes);
 
   bool get enableLiveTypeAnalysis => _options.enableNativeLiveTypeAnalysis;
 
   void onInstantiatedType(InterfaceType type) {
     if (_unusedClasses.remove(type.element)) {
       _registeredClasses.add(type.element);
     }
   }
 
   /// Register [classes] as natively instantiated in [impactBuilder].
@@ skipping 33 matching lines @@
       }
       if (type is InterfaceType) {
         if (type == _commonElements.numType) {
           registerInstantiation(_commonElements.doubleType);
           registerInstantiation(_commonElements.intType);
         } else if (type == _commonElements.intType ||
             type == _commonElements.doubleType ||
             type == _commonElements.stringType ||
             type == _commonElements.nullType ||
             type == _commonElements.boolType ||
-            _elementEnvironment.isSubtype(type,
+            _dartTypes.isSubtype(type,
                 _elementEnvironment.getRawType(_commonElements.jsArrayClass))) {
           registerInstantiation(type);
         }
         // TODO(johnniwinther): Improve spec string precision to handle type
         // arguments and implements relations that preserve generics. Currently
         // we cannot distinguish between `List`, `List<dynamic>`, and
         // `List<int>` and take all to mean `List<E>`; in effect not including
         // any native subclasses of generic classes.
         // TODO(johnniwinther,sra): Find and replace uses of `List` with the
         // actual implementation classes such as `JSArray` et al.
         matchingClasses
             .addAll(_findUnusedClassesMatching((ClassEntity nativeClass) {
           InterfaceType nativeType =
               _elementEnvironment.getThisType(nativeClass);
           InterfaceType specType =
               _elementEnvironment.getThisType(type.element);
-          return _elementEnvironment.isSubtype(nativeType, specType);
+          return _dartTypes.isSubtype(nativeType, specType);
         }));
       } else if (type.isDynamic) {
         matchingClasses.addAll(_unusedClasses);
       } else {
         assert(type is VoidType);
       }
     }
     if (matchingClasses.isNotEmpty && _registeredClasses.isEmpty) {
       matchingClasses.addAll(_onFirstNativeClass(impactBuilder));
     }
@@ skipping 48 matching lines @@
   final BackendUsageBuilder _backendUsageBuilder;
 
   /// The set of all native classes.  Each native class is in [nativeClasses]
   /// and exactly one of [unusedClasses] and [registeredClasses].
   final Set<ClassEntity> _nativeClasses = new Set<ClassEntity>();
 
   NativeResolutionEnqueuer(
       CompilerOptions options,
       ElementEnvironment elementEnvironment,
       CommonElements commonElements,
+      DartTypes dartTypes,
       this._backendUsageBuilder,
       this._nativeClassFinder)
-      : super(options, elementEnvironment, commonElements);
+      : super(options, elementEnvironment, commonElements, dartTypes);
 
   Iterable<ClassEntity> get nativeClassesForTesting => _nativeClasses;
 
   Iterable<ClassEntity> get registeredClassesForTesting => _registeredClasses;
 
   void _registerBackendUse(FunctionEntity element) {
     _backendUsageBuilder.registerBackendFunctionUse(element);
     _backendUsageBuilder.registerGlobalFunctionDependency(element);
   }
 
@@ skipping 20 matching lines @@
   final CodeEmitterTask _emitter;
   final NativeResolutionEnqueuer _resolutionEnqueuer;
   final NativeData _nativeData;
 
   final Set<ClassEntity> _doneAddSubtypes = new Set<ClassEntity>();
 
   NativeCodegenEnqueuer(
       CompilerOptions options,
       ElementEnvironment elementEnvironment,
       CommonElements commonElements,
+      DartTypes dartTypes,
       this._emitter,
       this._resolutionEnqueuer,
       this._nativeData)
-      : super(options, elementEnvironment, commonElements);
+      : super(options, elementEnvironment, commonElements, dartTypes);
 
   WorldImpact processNativeClasses(Iterable<LibraryElement> libraries) {
     WorldImpactBuilderImpl impactBuilder = new WorldImpactBuilderImpl();
     _unusedClasses.addAll(_resolutionEnqueuer._nativeClasses);
 
     if (!enableLiveTypeAnalysis) {
       _registerTypeUses(
           impactBuilder, _resolutionEnqueuer._nativeClasses, 'forced');
     }
 
@@ skipping 50 matching lines @@
         emitter.directSubtypes.putIfAbsent(superclass, () => <ClassEntity>[]);
     directSubtypes.add(cls);
   }
 
   void logSummary(void log(String message)) {
     super.logSummary(log);
     log('Compiled ${_registeredClasses.length} native classes, '
         '${_unusedClasses.length} native classes omitted.');
   }
 }