Move otherDependencies to globalDependencies.

pkg/compiler/lib/src/resolution/tree_elements.dart

 // Copyright (c) 2015, 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.resolution.tree_elements;
 
 import '../common.dart';
 import '../constants/expressions.dart';
 import '../dart_types.dart';
 import '../elements/elements.dart';
 import '../types/types.dart' show
     TypeMask;
 import '../tree/tree.dart';
 import '../util/util.dart';
 import '../universe/selector.dart' show
     Selector;
 
 import 'secret_tree_element.dart' show
     getTreeElement,
     setTreeElement;
 import 'send_structure.dart';
 
 abstract class TreeElements {
   AnalyzableElement get analyzedElement;
   Iterable<Node> get superUses;
 
-  /// Iterables of the dependencies that this [TreeElement] records of
-  /// [analyzedElement].
-  Iterable<Element> get allElements;
-
   /// The set of types that this TreeElement depends on.
   /// This includes instantiated types, types in is-checks and as-expressions
   /// and in checked mode the types of all type-annotations.
   Iterable<DartType> get requiredTypes;
 
   void forEachConstantNode(f(Node n, ConstantExpression c));
 
-  /// A set of additional dependencies.  See [registerDependency] below.
-  Iterable<Element> get otherDependencies;
-
   Element operator[](Node node);
   Map<Node, DartType> get typesCache;
 
   SendStructure getSendStructure(Send send);
 
   // TODO(johnniwinther): Investigate whether [Node] could be a [Send].
   Selector getSelector(Node node);
   Selector getGetterSelectorInComplexSendSet(SendSet node);
   Selector getOperatorSelectorInComplexSendSet(SendSet node);
   DartType getType(Node node);
@@ skipping 29 matching lines @@
    * Returns [:true:] if [node] is a type literal.
    *
    * Resolution marks this by setting the type on the node to be the
    * type that the literal refers to.
    */
   bool isTypeLiteral(Send node);
 
   /// Returns the type that the type literal [node] refers to.
   DartType getTypeLiteralType(Send node);
 
-  /// Register additional dependencies required by [analyzedElement].
-  /// For example, elements that are used by a backend.
-  void registerDependency(Element element);
-
   /// Register a dependency on [type].
   void addRequiredType(DartType type);
 
   /// Returns a list of nodes that potentially mutate [element] anywhere in its
   /// scope.
   List<Node> getPotentialMutations(VariableElement element);
 
   /// Returns a list of nodes that potentially mutate [element] in [node].
   List<Node> getPotentialMutationsIn(Node node, VariableElement element);
 
@@ skipping 19 matching lines @@
   bool get containsTryStatement;
 }
 
 class TreeElementMapping extends TreeElements {
   final AnalyzableElement analyzedElement;
   Map<Spannable, Selector> _selectors;
   Map<Spannable, TypeMask> _typeMasks;
   Map<Node, DartType> _types;
   Map<Node, DartType> typesCache = <Node, DartType>{};
   Setlet<Node> _superUses;
-  Setlet<Element> _otherDependencies;
   Map<Node, ConstantExpression> _constants;
   Map<VariableElement, List<Node>> _potentiallyMutated;
   Map<Node, Map<VariableElement, List<Node>>> _potentiallyMutatedIn;
   Map<VariableElement, List<Node>> _potentiallyMutatedInClosure;
   Map<Node, Map<VariableElement, List<Node>>> _accessedByClosureIn;
-  Setlet<Element> _elements;
   Maplet<Send, SendStructure> _sendStructureMap;
   Setlet<DartType> _requiredTypes;
   bool containsTryStatement = false;
 
   /// Map from nodes to the targets they define.
   Map<Node, JumpTarget> _definedTargets;
 
   /// Map from goto statements to their targets.
   Map<GotoStatement, JumpTarget> _usedTargets;
 
@@ skipping 16 matching lines @@
         return analyzedElement.implementationLibrary.isPatch;
       }
       return true;
     }));
     // TODO(ahe): Investigate why the invariant below doesn't hold.
     // assert(invariant(node,
     //                  getTreeElement(node) == element ||
     //                  getTreeElement(node) == null,
     //                  message: '${getTreeElement(node)}; $element'));
 
-    if (_elements == null) {
-      _elements = new Setlet<Element>();
-    }
-    _elements.add(element);
     setTreeElement(node, element);
   }
 
   operator [](Node node) => getTreeElement(node);
 
   SendStructure getSendStructure(Send send) {
     if (_sendStructureMap == null) return null;
     return _sendStructureMap[send];
   }
 
@@ skipping 116 matching lines @@
   }
 
   bool isTypeLiteral(Send node) {
     return getType(node) != null;
   }
 
   DartType getTypeLiteralType(Send node) {
     return getType(node);
   }
 
-  void registerDependency(Element element) {
-    if (element == null) return;
-    if (_otherDependencies == null) {
-      _otherDependencies = new Setlet<Element>();
-    }
-    _otherDependencies.add(element.implementation);
-  }
-
-  Iterable<Element> get otherDependencies {
-    return _otherDependencies != null ? _otherDependencies : const <Element>[];
-  }
-
   List<Node> getPotentialMutations(VariableElement element) {
     if (_potentiallyMutated == null) return const <Node>[];
     List<Node> mutations = _potentiallyMutated[element];
     if (mutations == null) return const <Node>[];
     return mutations;
   }
 
   void registerPotentialMutation(VariableElement element, Node mutationNode) {
     if (_potentiallyMutated == null) {
       _potentiallyMutated = new Maplet<VariableElement, List<Node>>();
@@ skipping 53 matching lines @@
       _accessedByClosureIn = new Map<Node, Map<VariableElement, List<Node>>>();
     }
     Map<VariableElement, List<Node>> accessMap =
         _accessedByClosureIn.putIfAbsent(contextNode,
           () => new Maplet<VariableElement, List<Node>>());
     accessMap.putIfAbsent(element, () => <Node>[]).add(accessNode);
   }
 
   String toString() => 'TreeElementMapping($analyzedElement)';
 
-  Iterable<Element> get allElements {
-    return _elements != null ? _elements : const <Element>[];
-  }
-
   void forEachConstantNode(f(Node n, ConstantExpression c)) {
     if (_constants != null) {
       _constants.forEach(f);
     }
   }
 
   FunctionElement getFunctionDefinition(FunctionExpression node) {
     return this[node];
   }
 
@@ skipping 120 matching lines @@
   }
 
   void setCurrentTypeMask(ForIn node, TypeMask mask) {
     _setTypeMask(node.inToken, mask);
   }
 
   TypeMask getCurrentTypeMask(ForIn node) {
     return _getTypeMask(node.inToken);
   }
 }