Rewrite, document, and test qualifiedNamesIn.

dart/pkg/dart2js_incremental/lib/library_updater.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.
 
 library dart2js_incremental.library_updater;
 
 import 'dart:async' show
     Future;
 
 import 'dart:convert' show
@@ skipping 217 matching lines @@
     if (element is PartialFunctionElement) {
       return canReuseRemovedFunction(element);
     }
     return cannotReuse(
         element, "Removed element that isn't a method.");
   }
 
   bool canReuseRemovedFunction(PartialFunctionElement element) {
     logVerbose("Removed method $element.");
 
-    PartialClassElement cls = element.enclosingClass;
-    for (ScopeContainerElement scope in scopesAffectedBy(element, cls)) {
+    ScopeContainerElement container = element.enclosingElement;
+    for (ScopeContainerElement scope in scopesAffectedBy(element, container)) {
       scanSites(scope, (Element member, DeclarationSite site) {
         // TODO(ahe): Cache qualifiedNamesIn to avoid quadratic behavior.
         Map<String, List<String>> names = qualifiedNamesIn(site);
-        if (canNamesResolveTo(names, element, cls)) {
+        if (canNamesResolveTo(names, element, container)) {
           _elementsToInvalidate.add(member);
         }
       });
     }
 
     _removedElements.add(element);
 
     updates.add(new RemovedFunctionUpdate(compiler, element));
 
     return true;
   }
 
+  /// Invoke [f] on each [DeclarationSite] in [element]. If [element] is a
+  /// [ScopeContainerElement], invoke f on all local members as well.
   void scanSites(
       Element element,
       void f(ElementX element, DeclarationSite site)) {
     DeclarationSite site = declarationSite(element);
     if (site != null) {
       f(element, site);
     }
     if (element is ScopeContainerElement) {
       element.forEachLocalMember((member) { scanSites(member, f); });
     }
   }
 
+  /// Assume [element] is either removed from or added to [container], and
+  /// return all [ScopeContainerElement] that can see this change.
   List<ScopeContainerElement> scopesAffectedBy(
       Element element,
-      ClassElement cls) {
+      ScopeContainerElement container) {
     // TODO(ahe): Use library export graph to compute this.
     // TODO(ahe): Should return all user-defined libraries and packages.
-    LibraryElement library = element.library;
+    LibraryElement library = container.library;
     List<ScopeContainerElement> result = <ScopeContainerElement>[library];
 
-    if (cls == null) return result;
+    if (!container.isClass) return result;
+
+    ClassElement cls = container;
 
     var externalSubtypes =
         compiler.world.subtypesOf(cls).where((e) => e.library != library);
 
     return result..addAll(externalSubtypes);
   }
 
   /// Returns true if function [before] can be reused to reflect the changes in
   /// [after].
   ///
@@ skipping 380 matching lines @@
       if (superName != null) {
         updates.add(
             js.statement('delete #.prototype.#', [elementAccess, superName]));
       }
     } else {
       updates.add(js.statement('delete #', [elementAccess]));
     }
   }
 }
 
-Map<String, List<String>> qualifiedNamesIn(PartialElement element) {
+/// Returns all qualified names in [element] with less than four identifiers. A
+/// qualified name is an identifier followed by a sequence of dots and
+/// identifiers, for example, "x", and "x.y.z". But not "x.y.z.w" ("w" is the
+/// fourth identifier).

[Johnni Winther, 2014/11/14 10:33:35]

I guess the reason for the limit is prefix.Class.staticProperty is the longest
qualified name for a statically resolved entity. 

Please add the (this) reasoning to documentation.

[ahe, 2014/11/17 10:39:47]

Done.

+Set<String> qualifiedNamesIn(PartialElement element) {
   Token beginToken = element.beginToken;
   Token endToken = element.endToken;
   Token token = beginToken;
   if (element is PartialClassElement) {
     ClassNode node = element.cachedNode;
     if (node != null) {
       NodeList body = node.body;
       if (body != null) {
         endToken = body.beginToken;
       }
     }
   }
-  Map<String, List<String>> names = new Map<String, List<String>>();
-  List<List<Token>> qualifieds = <List<Token>>[];
+  Set<String> names = new Set<String>();
   do {
     if (token.isIdentifier()) {
-      List<String> name = names.putIfAbsent(token.value, () => <String>[]);
-      while (identical('.', token.next.stringValue) &&
-             token.next.next.isIdentifier()) {
+      String name = token.value;
+      // [name] is a single "identifier".
+      names.add(name);
+      if (identical('.', token.next.stringValue) &&
+          token.next.next.isIdentifier()) {
         token = token.next.next;
-        name.add(token.value);
+        name += '.${token.value}';
+        // [name] is "idenfifier.idenfifier".
+        names.add(name);
+
+        if (identical('.', token.next.stringValue) &&
+            token.next.next.isIdentifier()) {
+          token = token.next.next;
+          name += '.${token.value}';
+          // [name] is "idenfifier.idenfifier.idenfifier".
+          names.add(name);
+
+          while (identical('.', token.next.stringValue) &&
+                 token.next.next.isIdentifier()) {
+            // Skip remaining identifiers, they cannot statically resolve to
+            // anything, and must be dynamic sends.
+            token = token.next.next;
+          }
+        }
       }
     }
     token = token.next;
   } while (token.kind != EOF_TOKEN && token != endToken);
   return names;
 }
 
+/// Returns true if one of the qualified names in names (as computed by
+/// [qualifiedNamesIn]) could be a static reference to [element].
 bool canNamesResolveTo(

[Johnni Winther, 2014/11/14 10:33:35]

Maybe rename to 'canNamesResolveStaticallyTo'

[ahe, 2014/11/17 10:39:47]

Done.

-    Map<String, List<String>> names,
+    Set<String> names,
     Element element,
-    ClassElement cls) {
-  if (names.containsKey(element.name)) {
-    return true;
+    ScopeContainerElement container) {
+  if (names.contains(element.name)) return true;
+  if (container != null && container.isClass) {
+    // [names] contains C.m, where C is the name of [container], and m is the
+    // name of [element].
+    if (names.contains("${container.name}.${element.name}")) return true;
   }
-  if (cls != null) {
-    List<String> rest = names[cls.name];
-    if (rest != null && rest.contains(element.name)) {
-      // [names] contains C.m, where C is the name of [cls], and m is the name
-      // of [element].
-      return true;
-    }
-  }
+  // TODO(ahe): Check for prefixes as well.
   return false;
 }
 
 DeclarationSite declarationSite(Element element) {
   return element is ElementX ? element.declarationSite : null;
 }
 
 abstract class JsFeatures {
   Compiler get compiler;
 
@@ skipping 11 matching lines @@
 
   ClassEmitter get classEmitter => backend.emitter.oldEmitter.classEmitter;
 
   List<String> computeFields(ClassElement cls) {
     // TODO(ahe): Rewrite for new emitter.
     ClassBuilder builder = new ClassBuilder(cls, namer);
     classEmitter.emitFields(cls, builder, "");
     return builder.fields;
   }
 }