Merge CommonElements and BackendHelpers!

pkg/compiler/lib/src/js_backend/backend_usage.dart

 // Copyright (c) 2017, 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.dart';
 import '../common_elements.dart';
 import '../elements/elements.dart' show Element;
 import '../elements/entities.dart';
 import '../elements/types.dart';
 import '../util/util.dart' show Setlet;
-import 'backend_helpers.dart';
 import 'backend_impact.dart';
 
 abstract class BackendUsage {
   bool needToInitializeIsolateAffinityTag;
   bool needToInitializeDispatchProperty;
 
   /// Returns `true` if [element] is a function called by the backend.
   bool isFunctionUsedByBackend(FunctionEntity element);
 
   /// Returns `true` if [element] is an instance field of a class instantiated
@@ skipping 59 matching lines @@
   bool isFunctionApplyUsed;
 
   /// `true` if `noSuchMethod` is used.
   bool isNoSuchMethodUsed;
 
   BackendUsage close();
 }
 
 class BackendUsageBuilderImpl implements BackendUsageBuilder {
   final CommonElements _commonElements;
-  final BackendHelpers _helpers;
   // TODO(johnniwinther): Remove the need for these.
   Setlet<FunctionEntity> _globalFunctionDependencies;
   Setlet<ClassEntity> _globalClassDependencies;
 
   /// List of methods that the backend may use.
   final Set<FunctionEntity> _helperFunctionsUsed = new Set<FunctionEntity>();
 
   /// List of classes that the backend may use.
   final Set<ClassEntity> _helperClassesUsed = new Set<ClassEntity>();
 
@@ skipping 11 matching lines @@
 
   /// `true` if the `dart:isolate` library is in use.
   bool isIsolateInUse = false;
 
   /// `true` if `Function.apply` is used.
   bool isFunctionApplyUsed = false;
 
   /// `true` if `noSuchMethod` is used.
   bool isNoSuchMethodUsed = false;
 
-  BackendUsageBuilderImpl(this._commonElements, this._helpers);
+  BackendUsageBuilderImpl(this._commonElements);
 
   @override
   void registerBackendFunctionUse(FunctionEntity element) {
     assert(invariant(element, _isValidBackendUse(element),
         message: "Backend use of $element is not allowed."));
     _helperFunctionsUsed.add(element);
   }
 
   @override
   void registerBackendClassUse(ClassEntity element) {
     assert(invariant(element, _isValidBackendUse(element),
         message: "Backend use of $element is not allowed."));
     _helperClassesUsed.add(element);
   }
 
   bool _isValidBackendUse(Entity element) {
     if (_isValidEntity(element)) return true;
     if (element is Element) {
       assert(invariant(element, element.isDeclaration,
           message: "Backend use $element must be the declaration."));
       if (element.implementationLibrary.isPatch ||
           // Needed to detect deserialized injected elements, that is
           // element declared in patch files.
           (element.library.isPlatformLibrary &&
               element.sourcePosition.uri.path
                   .contains('_internal/js_runtime/lib/')) ||
-          element.library == _helpers.jsHelperLibrary ||
-          element.library == _helpers.interceptorsLibrary ||
-          element.library == _helpers.isolateHelperLibrary) {
+          element.library == _commonElements.jsHelperLibrary ||
+          element.library == _commonElements.interceptorsLibrary ||
+          element.library == _commonElements.isolateHelperLibrary) {
         // TODO(johnniwinther): We should be more precise about these.
         return true;
       } else {
+        print('mah source position path ${element.sourcePosition.uri.path}');

[Johnni Winther, 2017/04/11 09:16:00]

Remove?

[Emily Fortuna, 2017/04/11 21:31:35]

ooops, yes, thank you!

         return false;
       }
     }
     // TODO(johnniwinther): Support remaining checks on [Entity]s.
     return true;
   }
 
   bool _isValidEntity(Entity element) {
     if (element is ConstructorEntity &&
-        (element == _helpers.streamIteratorConstructor ||
+        (element == _commonElements.streamIteratorConstructor ||
             _commonElements.isSymbolConstructor(element) ||
-            _helpers.isSymbolValidatedConstructor(element) ||
-            element == _helpers.syncCompleterConstructor)) {
+            _commonElements.isSymbolValidatedConstructor(element) ||
+            element == _commonElements.syncCompleterConstructor)) {
       // TODO(johnniwinther): These are valid but we could be more precise.
       return true;
     } else if (element == _commonElements.symbolClass ||
-        element == _helpers.objectNoSuchMethod) {
+        element == _commonElements.objectNoSuchMethod) {
       // TODO(johnniwinther): These are valid but we could be more precise.
       return true;
     } else if (element == _commonElements.listClass ||
-        element == _helpers.mapLiteralClass ||
+        element == _commonElements.mapLiteralClass ||
         element == _commonElements.functionClass ||
         element == _commonElements.stringClass) {
       // TODO(johnniwinther): Avoid these.
       return true;
-    } else if (element == _helpers.genericNoSuchMethod ||
-        element == _helpers.unresolvedConstructorError ||
-        element == _helpers.malformedTypeError) {
+    } else if (element == _commonElements.genericNoSuchMethod ||
+        element == _commonElements.unresolvedConstructorError ||
+        element == _commonElements.malformedTypeError) {
       return true;
     }
     return false;
   }
 
   void _processBackendStaticUse(FunctionEntity element,
       {bool isGlobal: false}) {
     registerBackendFunctionUse(element);
     if (isGlobal) {
       registerGlobalFunctionDependency(element);
@@ skipping 34 matching lines @@
           _needToInitializeDispatchProperty = true;
           break;
         case BackendFeature.needToInitializeIsolateAffinityTag:
           _needToInitializeIsolateAffinityTag = true;
           break;
       }
     }
   }
 
   void registerUsedMember(MemberEntity member) {
-    if (member == _helpers.getIsolateAffinityTagMarker) {
+    if (member == _commonElements.getIsolateAffinityTagMarker) {
       _needToInitializeIsolateAffinityTag = true;
-    } else if (member == _helpers.requiresPreambleMarker) {
+    } else if (member == _commonElements.requiresPreambleMarker) {
       requiresPreamble = true;
-    } else if (member == _helpers.invokeOnMethod) {
+    } else if (member == _commonElements.invokeOnMethod) {
       isInvokeOnUsed = true;
     } else if (_commonElements.isFunctionApplyMethod(member)) {
       isFunctionApplyUsed = true;
     }
   }
 
   void registerGlobalFunctionDependency(FunctionEntity element) {
     assert(element != null);
     if (_globalFunctionDependencies == null) {
       _globalFunctionDependencies = new Setlet<FunctionEntity>();
@@ skipping 86 matching lines @@
     return _helperClassesUsed.contains(element.enclosingClass);
   }
 
   @override
   Iterable<FunctionEntity> get globalFunctionDependencies =>
       _globalFunctionDependencies;
 
   @override
   Iterable<ClassEntity> get globalClassDependencies => _globalClassDependencies;
 }