Field property naming fix - issues 14096, 14806

sdk/lib/_internal/compiler/implementation/elements/modelx.dart

 // Copyright (c) 2013, 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 elements.modelx;
 
 import 'elements.dart';
 import '../../compiler.dart' as api;
 import '../tree/tree.dart';
 import '../util/util.dart';
@@ skipping 1886 matching lines @@
    * [memberName]. This method is NOT to be used for resolving
    * unqualified sends because it does not implement the scoping
    * rules, where library scope comes before superclass scope.
    */
   Element lookupMember(String memberName) {
     Element localMember = lookupLocalMember(memberName);
     return localMember == null ? lookupSuperMember(memberName) : localMember;
   }
 
   /**
-   * Returns true if the [fieldMember] is shadowed by another field. The given
-   * [fieldMember] must be a member of this class.
+   * Returns true if the [fieldMember] shadows another field.  The given
+   * [fieldMember] must be a member of this class, i.e. if there is a field of
+   * the same name in the superclass chain.
    *
    * This method also works if the [fieldMember] is private.
    */
-  bool isShadowedByField(Element fieldMember) {
+  bool hasFieldShadowedBy(Element fieldMember) {
     assert(fieldMember.isField());
     String fieldName = fieldMember.name;
     bool isPrivate = isPrivateName(fieldName);
     LibraryElement memberLibrary = fieldMember.getLibrary();
-    ClassElement lookupClass = this;
+    ClassElement lookupClass = this.superclass;
     while (lookupClass != null) {
       Element foundMember = lookupClass.lookupLocalMember(fieldName);
       if (foundMember != null) {
-        if (foundMember == fieldMember) return false;
         if (foundMember.isField()) {
           if (!isPrivate || memberLibrary == foundMember.getLibrary()) {
-            // Private fields can only be shadowed by a field declared
-            // in the same library.
+            // Private fields can only be shadowed by a field declared in the
+            // same library.
             return true;
           }
         }
       }
       lookupClass = lookupClass.superclass;
     }
     return false;
   }
 
   Element validateConstructorLookupResults(Selector selector,
@@ skipping 434 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }