Make field-get/set work without elements.

lib/compiler/implementation/emitter.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.
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
 class ClosureInvocationElement extends FunctionElement {
   ClosureInvocationElement(SourceString name,
@@ skipping 407 matching lines @@
       defineInstanceMember(namer.getName(member), codeBuffer);
       codeBuffer = compiler.codegenWorld.generatedBailoutCode[member];
       if (codeBuffer !== null) {
         defineInstanceMember(compiler.namer.getBailoutName(member), codeBuffer);
       }
       FunctionElement function = member;
       FunctionSignature parameters = function.computeSignature(compiler);
       if (!parameters.optionalParameters.isEmpty()) {
         addParameterStubs(member, defineInstanceMember);
       }
-    } else if (member.kind === ElementKind.FIELD) {
-      SourceString name = member.name;
-      ClassElement cls = member.getEnclosingClass();
-      if (cls.lookupSuperMember(name) !== null) {
-        String fieldName = namer.instanceFieldName(cls, name);
-        CodeBuffer getterBuffer = new CodeBuffer();
-        getterBuffer.add('function() {\n  return this.$fieldName;\n }');
-        defineInstanceMember(namer.getterName(cls.getLibrary(), name),
-                             getterBuffer);
-        CodeBuffer setterBuffer = new CodeBuffer();
-        setterBuffer.add('function(x) {\n  this.$fieldName = x;\n }');
-        defineInstanceMember(namer.setterName(cls.getLibrary(), name),
-                             setterBuffer);
-      }
-    } else {
+    } else if (member.kind !== ElementKind.FIELD) {
       compiler.internalError('unexpected kind: "${member.kind}"',
                              element: member);
     }
     emitExtraAccessors(member, defineInstanceMember);
   }
 
   Set<Element> emitClassFields(ClassElement classElement, CodeBuffer buffer) {
     // If the class is never instantiated we still need to set it up for
     // inheritance purposes, but we can simplify its JavaScript constructor.
     bool isInstantiated =
         compiler.codegenWorld.instantiatedClasses.contains(classElement);
 
     bool isFirstField = true;
     void addField(ClassElement enclosingClass, Element member) {
       assert(!member.isNative());
+
+      LibraryElement library = member.getLibrary();
+      SourceString name = member.name;
+      bool isPrivate = name.isPrivate();
       // See if we can dynamically create getters and setters.
       // We can only generate getters and setters for [classElement] since
       // the fields of super classes could be overwritten with getters or
       // setters.
       bool needsDynamicGetter = false;
       bool needsDynamicSetter = false;
+      // We need to name shadowed fields differently, so they don't clash with
+      // the non-shadowed field.
+      bool isShadowed = false;
       if (enclosingClass === classElement) {
         needsDynamicGetter = instanceFieldNeedsGetter(member);
         needsDynamicSetter = instanceFieldNeedsSetter(member);
+      } else {
+        isShadowed = classElement.isShadowedByField(member);
       }
 
       if ((isInstantiated && !enclosingClass.isNative())
           || needsDynamicGetter
           || needsDynamicSetter) {
         if (isFirstField) {
           isFirstField = false;
         } else {
           buffer.add(", ");
         }
-        SourceString name = member.name;
-        String fieldName = namer.instanceFieldName(member.getEnclosingClass(),
-                                                   name);
+        String fieldName = isShadowed
+            ? namer.shadowedFieldName(member)
+            : namer.instanceFieldName(library, name);
         // Getters and setters with suffixes will be generated dynamically.
         buffer.add('"$fieldName');
         if (needsDynamicGetter || needsDynamicSetter) {
           if (needsDynamicGetter && needsDynamicSetter) {
             buffer.add(GETTER_SETTER_SUFFIX);
           } else if (needsDynamicGetter) {
             buffer.add(GETTER_SUFFIX);
           } else {
             buffer.add(SETTER_SUFFIX);
           }
@@ skipping 32 matching lines @@
       }
     });
 
     generateTypeTests(classElement, (Element other) {
       String code;
       if (nativeEmitter.requiresNativeIsCheck(other)) {
         code = 'function() { return true; }';
       } else {
         code = 'true';
       }
-      CodeBuffer buffer = new CodeBuffer();
-      buffer.add(code);
-      defineInstanceMember(namer.operatorIs(other), buffer);
+      CodeBuffer typeTestBuffer = new CodeBuffer();
+      typeTestBuffer.add(code);
+      defineInstanceMember(namer.operatorIs(other), typeTestBuffer);
     });
 
     if (classElement === compiler.objectClass && compiler.enabledNoSuchMethod) {
       // Emit the noSuchMethod handlers on the Object prototype now,
       // so that the code in the dynamicFunction helper can find
       // them. Note that this helper is invoked before analyzing the
       // full JS script.
       emitNoSuchMethodHandlers(defineInstanceMember);
     }
   }
@@ skipping 230 matching lines @@
     defineInstanceMember(getterName, getterBuffer);
   }
 
   void emitCallStubForGetter(Element member,
                              Set<Selector> selectors,
                              DefineMemberFunction defineInstanceMember) {
     String getter;
     if (member.kind == ElementKind.GETTER) {
       getter = "this.${namer.getterName(member.getLibrary(), member.name)}()";
     } else {
-      String name = namer.instanceFieldName(member.getEnclosingClass(),
-                                            member.name);
+      String name = namer.instanceFieldName(member.getLibrary(), member.name);
       getter = "this.$name";
     }
     for (Selector selector in selectors) {
       if (selector.applies(member, compiler)) {
         String invocationName =
             namer.instanceMethodInvocationName(member.getLibrary(), member.name,
                                                selector);
         SourceString callName = namer.CLOSURE_INVOCATION_NAME;
         String closureCallName =
             namer.instanceMethodInvocationName(member.getLibrary(), callName,
@@ skipping 372 matching lines @@
         sourceName = token.slowToString();
       }
       int totalOffset = bufferOffset + offset;
       sourceMapBuilder.addMapping(
           sourceFile, token.charOffset, sourceName, totalOffset);
     });
   }
 }
 
 typedef void DefineMemberFunction(String invocationName, CodeBuffer definition);