Field property naming fix - issues 14096, 14806

sdk/lib/_internal/compiler/implementation/ssa/codegen.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.
 
 part of ssa;
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
@@ skipping 1599 matching lines @@
 
     push(new js.VariableUse(backend.namer.isolateAccess(node.element)));
     push(new js.Call(pop(), visitArguments(node.inputs, start: 0)), node);
   }
 
   visitInvokeSuper(HInvokeSuper node) {
     Element superMethod = node.element;
     world.registerStaticUse(superMethod);
     ClassElement superClass = superMethod.getEnclosingClass();
     if (superMethod.kind == ElementKind.FIELD) {
-      String fieldName = superMethod.hasFixedBackendName()
-          ? superMethod.fixedBackendName()
-          : node.caller.isShadowedByField(superMethod)
-              ? backend.namer.shadowedFieldName(superMethod)
-              : backend.namer.instanceFieldName(superMethod);
+      String fieldName = backend.namer.instanceFieldPropertyName(superMethod);
       use(node.inputs[0]);
       js.PropertyAccess access =
           new js.PropertyAccess.field(pop(), fieldName);
       if (node.isSetter) {
         use(node.value);
         push(new js.Assignment(access, pop()), node);
       } else {
         push(access, node);
       }
     } else {
@@ skipping 47 matching lines @@
               compiler.constantHandler.getConstantForVariable(element);
           assert(invariant(element, constant != null,
               message: 'No constant computed for $element'));
           var jsConstant = backend.emitter.constantReference(constant);
           push(new js.Call(jsConstant, [pop()]), node);
         }
       } else {
         push(new js.PropertyAccess.field(pop(), 'length'), node);
       }
     } else {
-      String name = _fieldPropertyName(element);
+      String name = backend.namer.instanceFieldPropertyName(element);
       push(new js.PropertyAccess.field(pop(), name), node);
       world.registerFieldGetter(element);
     }
   }
 
   visitFieldSet(HFieldSet node) {
     Element element = node.element;
     world.registerFieldSetter(element);
-    String name = _fieldPropertyName(element);
+    String name = backend.namer.instanceFieldPropertyName(element);
     use(node.receiver);
     js.Expression receiver = pop();
     use(node.value);
     push(new js.Assignment(new js.PropertyAccess.field(receiver, name), pop()),
         node);
   }
 
-  String _fieldPropertyName(Element element) => element.hasFixedBackendName()
-      ? element.fixedBackendName()
-      : backend.namer.getNameOfInstanceMember(element);
-
   visitLocalGet(HLocalGet node) {
     use(node.receiver);
   }
 
   visitLocalSet(HLocalSet node) {
     use(node.value);
     assignVariable(variableNames.getName(node.receiver), pop());
   }
 
   void registerForeignTypes(HForeign node) {
@@ skipping 866 matching lines @@
     if (left.isConstantNull() || right.isConstantNull() ||
         (left.isPrimitive(compiler) &&
          left.instructionType == right.instructionType)) {
       return '==';
     }
     return null;
   } else {
     return '===';
   }
 }