Field property naming fix - issues 14096, 14806

sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.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.
 
 part of dart2js.js_emitter;
 
 class ClassEmitter extends CodeEmitterHelper {
   /**
    * Documentation wanted -- johnniwinther
    *
@@ skipping 142 matching lines @@
           if (!needsAccessor) {
             // Emit field for constructor generation.
             assert(!classIsNative);
             buffer.write(name);
           } else {
             // Emit (possibly renaming) field name so we can add accessors at
             // runtime.
             buffer.write(accessorName);
             if (name != accessorName) {
               buffer.write(':$name');
-              // Only the native classes can have renaming accessors.
-              assert(classIsNative);
             }
 
             int getterCode = 0;
             if (needsGetter) {
               if (field.isInstanceMember()) {
                 // 01:  function() { return this.field; }
                 // 10:  function(receiver) { return receiver.field; }
                 // 11:  function(receiver) { return this.field; }
                 bool isIntercepted = backend.fieldHasInterceptedGetter(field);
                 getterCode += isIntercepted ? 2 : 0;
@@ skipping 237 matching lines @@
       // into a native class.
       bool isMixinNativeField =
           isClass && element.isNative() && holder.isMixinApplication;
 
       // See if we can dynamically create getters and setters.
       // We can only generate getters and setters for [element] since
       // the fields of super classes could be overwritten with getters or
       // setters.
       bool needsGetter = false;
       bool needsSetter = false;
-      // We need to name shadowed fields differently, so they don't clash with
-      // the non-shadowed field.
-      bool isShadowed = false;
       if (isLibrary || isMixinNativeField || holder == element) {
         needsGetter = fieldNeedsGetter(field);
         needsSetter = fieldNeedsSetter(field);
-      } else {
-        ClassElement cls = element;
-        isShadowed = cls.isShadowedByField(field);
       }
 
       if ((isInstantiated && !holder.isNative())
           || needsGetter
           || needsSetter) {
-        String accessorName = isShadowed
-            ? namer.shadowedFieldName(field)
-            : namer.getNameOfField(field);
-        String fieldName = field.hasFixedBackendName()
-            ? field.fixedBackendName()
-            : (isMixinNativeField ? name : accessorName);
+        String accessorName = namer.fieldAccessorName(field);
+        String fieldName = namer.fieldPropertyName(field);
         bool needsCheckedSetter = false;
         if (compiler.enableTypeAssertions
             && needsSetter
             && !canAvoidGeneratedCheckedSetter(field)) {
           needsCheckedSetter = true;
           needsSetter = false;
         }
         // Getters and setters with suffixes will be generated dynamically.
         f(field, fieldName, accessorName, needsGetter, needsSetter,
           needsCheckedSetter);
@@ skipping 124 matching lines @@
         ? new Selector.getter(member.name, member.getLibrary())
         : new Selector.setter(member.name, member.getLibrary());
     String reflectionName = task.getReflectionName(selector, name);
     if (reflectionName != null) {
       var reflectable =
           js(backend.isAccessibleByReflection(member) ? '1' : '0');
       builder.addProperty('+$reflectionName', reflectable);
     }
   }
 }