Fix field-accesses for private fields that were "shadowed" by other private fields.

lib/compiler/implementation/world.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.
 
 class World {
   Compiler compiler;  // Set in populate().
   final Map<ClassElement, Set<ClassElement>> subtypes;
 
   World() : subtypes = new Map<ClassElement, Set<ClassElement>>();
 
@@ skipping 12 matching lines @@
 
     compiler.resolverWorld.instantiatedClasses.forEach(addSubtypes);
 
     // Mark the world as populated.
     assert(compiler !== null);
     this.compiler = compiler;
   }
 
   /**
    * Returns a [MemberSet] that contains the possible targets of a
-   * selector named [member] on a receiver whose type is [type].
+   * selector named [member] accessible from the given [library] on a receiver
+   * with the given [type].
+   *
+   * The [library] can be `null` if the [member] is not private.
    */
-  MemberSet _memberSetFor(Type type, SourceString member) {
+  MemberSet _memberSetFor(Type type,

[kasperl, 2012/08/16 12:47:57]

Again it would seem like this could be rewritten with a selector instead of a
(library, member) pair.

[floitsch, 2012/08/16 16:15:55]

Done.

+                          LibraryElement library,
+                          SourceString member) {
     assert(compiler !== null);
     ClassElement cls = type.element;
     MemberSet result = new MemberSet(member);
-    Element element = cls.lookupMember(member);
+    Element element = cls.lookupMemberInLibrary(member, library);
     if (element !== null) result.add(element);
 
+    bool isPrivate = member.isPrivate();
     Set<ClassElement> subtypesOfCls = subtypes[cls];
     if (subtypesOfCls !== null) {
       for (ClassElement sub in subtypesOfCls) {
+        // Private members from a different library are not visible.
+        if (isPrivate && sub.getLibrary() != library) continue;
         element = sub.lookupLocalMember(member);
         if (element !== null) result.add(element);
       }
     }
     return result;
   }
 
   /**
-   * Returns the single field with the given name, if such a field
-   * exists. If there are multple fields, or none, return null.
+   * Returns the single field with the given [name] accessible in the given
+   * [library]. If there is no such field, or there are multiple possible
+   * fields returns `null`.
    */
-  VariableElement locateSingleField(Type type, SourceString member) {
-    MemberSet memberSet = _memberSetFor(type, member);
+  VariableElement locateSingleField(Type type,
+                                    LibraryElement library,
+                                    SourceString name) {
+    MemberSet memberSet = _memberSetFor(type, library, name);
     int fieldCount = 0;
     int nonFieldCount = 0;
     VariableElement field;
     memberSet.elements.forEach((Element element) {
       if (element.isField()) {
         field = element;
         fieldCount++;
       } else {
         nonFieldCount++;
       }
     });
     return (fieldCount == 1 && nonFieldCount == 0) ? field : null;
   }
 
   Set<ClassElement> findNoSuchMethodHolders(Type type) {
     Set<ClassElement> result = new Set<ClassElement>();
-    MemberSet memberSet = _memberSetFor(type, Compiler.NO_SUCH_METHOD);
+    MemberSet memberSet = _memberSetFor(type, null, Compiler.NO_SUCH_METHOD);
     Selector noSuchMethodSelector = new Selector.noSuchMethod();
     for (Element element in memberSet.elements) {
       ClassElement holder = element.getEnclosingClass();
       if (holder !== compiler.objectClass &&
           noSuchMethodSelector.applies(element, compiler)) {
         result.add(holder);
       }
     }
     return result;
   }
 }
 
 /**
  * A [MemberSet] contains all the possible targets for a selector.
  */
 class MemberSet {
   final Set<Element> elements;
   final SourceString name;
 
   MemberSet(SourceString this.name) : elements = new Set<Element>();
 
   void add(Element element) {
     elements.add(element);
   }
 
   bool isEmpty() => elements.isEmpty();
 }