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

lib/compiler/implementation/ssa/optimize.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.
 
 interface OptimizationPhase {
   String get name();
   void visitGraph(HGraph graph);
 }
 
 class SsaOptimizerTask extends CompilerTask {
@@ skipping 537 matching lines @@
     HInstruction value = node.inputs[0];
     Type type = node.propagatedType.computeType(compiler);
     if (type.element === compiler.dynamicClass
         || type.element === compiler.objectClass) {
       return value;
     }
     HType combinedType = value.propagatedType.intersection(node.propagatedType);
     return (combinedType == value.propagatedType) ? value : node;
   }
 
+  Element findConcreteFieldForDynamicAccess(HInstruction receiver,

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

Can you use a selector instead of the fieldName here? The HInvokeDynamicGetter
should know the selector so you should know the library from that.

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

Done.

+                                            SourceString fieldName) {
+    if (!receiver.propagatedType.isUseful()) return null;
+    if (receiver.propagatedType.canBeNull()) return null;
+    Type type = receiver.propagatedType.computeType(compiler);
+    if (type === null) return null;
+    // TODO(floitsch): the library should not come from the current work item.
+    // Otherwise we cannot inline.
+    LibraryElement library = work.element.getLibrary();
+    Element field = compiler.world.locateSingleField(type, library, fieldName);
+    return field;
+  }
+
   HInstruction visitInvokeDynamicGetter(HInvokeDynamicGetter node) {
-    HInstruction receiver = node.inputs[0];
-    if (!receiver.propagatedType.isUseful()) return node;
-    if (receiver.propagatedType.canBeNull()) return node;
-    Type type = receiver.propagatedType.computeType(compiler);
-    if (type === null) return node;
-    Element field = compiler.world.locateSingleField(type, node.name);
-    if (field === null) return node;
+    Element field = findConcreteFieldForDynamicAccess(node.receiver, node.name);
+    if (field == null) return node;
+
     Modifiers modifiers = field.modifiers;
     bool isFinalOrConst = false;
     if (modifiers != null) {
       isFinalOrConst = modifiers.isFinal() || modifiers.isConst();
     }
     if (!compiler.resolverWorld.hasInvokedSetter(field, compiler)) {
       // If no setter is ever used for this field it is only initialized in the
       // initializer list.
       isFinalOrConst = true;
     }
@@ skipping 11 matching lines @@
           // un-initialized or initialized in the constructor initializer list.
           isFinalOrConst = true;
           break;
       }
     }
     return new HFieldGet.withElement(
         field, node.inputs[0], isFinalOrConst: isFinalOrConst);
   }
 
   HInstruction visitInvokeDynamicSetter(HInvokeDynamicSetter node) {
-    HInstruction receiver = node.inputs[0];
-    if (!receiver.propagatedType.isUseful()) return node;
-    if (receiver.propagatedType.canBeNull()) return node;
-    Type type = receiver.propagatedType.computeType(compiler);
-    if (type === null) return node;
-    Element field = compiler.world.locateSingleField(type, node.name);
+    Element field = findConcreteFieldForDynamicAccess(node.receiver, node.name);
     if (field === null) return node;
     return new HFieldSet.withElement(field, node.inputs[0], node.inputs[1]);
   }
 
   HInstruction visitStringConcat(HStringConcat node) {
     DartString folded = const LiteralDartString("");
     for (int i = 0; i < node.inputs.length; i++) {
       HInstruction part = node.inputs[i];
       if (!part.isConstant()) return node;
       HConstant constant = part;
@@ skipping 693 matching lines @@
       // this type for the field is still a strong signal
       // indicating the expected type of the field.
       field.propagatedType = type;
     } else {
       // If there are no invoked setters we know the type of
       // this field for sure.
       field.guaranteedType = type;
     }
   }
 }