Make field-get/set work without elements.

lib/compiler/implementation/ssa/nodes.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 HVisitor<R> {
   R visitAdd(HAdd node);
   R visitBailoutTarget(HBailoutTarget node);
   R visitBitAnd(HBitAnd node);
   R visitBitNot(HBitNot node);
   R visitBitOr(HBitOr node);
@@ skipping 1290 matching lines @@
 
   int typeCode() => 4;
   bool typeEquals(other) => other is HInvokeInterceptor;
   bool dataEquals(HInvokeInterceptor other) {
     return getter == other.getter && name == other.name;
   }
 }
 
 abstract class HFieldAccess extends HInstruction {
   final Element element;
+  final SourceString fieldName;
+  final LibraryElement libraryElement;

[kasperl, 2012/08/07 08:14:20]

Maybe shorten this to library?

[floitsch, 2012/08/07 12:20:16]

Done.

 
-  HFieldAccess(this.element, List<HInstruction> inputs) : super(inputs);
+  HFieldAccess(this.fieldName, this.libraryElement, List<HInstruction> inputs)
+      : element = null, super(inputs);
+
+  HFieldAccess.withElement(Element element, List<HInstruction> inputs)
+      : this.element = element,
+        fieldName = element.name,
+        libraryElement = element.getLibrary(),
+        super(inputs);
 }
 
 class HFieldGet extends HFieldAccess {
   final bool isFinalOrConst;
 
-  HFieldGet(Element element, HInstruction receiver,
+  HFieldGet(SourceString name, LibraryElement library, HInstruction receiver,
             [this.isFinalOrConst = false])
-      : super(element, <HInstruction>[receiver]);
+      : super(name, library, <HInstruction>[receiver]);
+
+  HFieldGet.withElement(Element element, HInstruction receiver,
+                        [this.isFinalOrConst = false])
+      : super.withElement(element, <HInstruction>[receiver]);
 
   HInstruction get receiver() => inputs[0];
 
   accept(HVisitor visitor) => visitor.visitFieldGet(this);
 
   void prepareGvn() {
     setUseGvn();
     clearAllSideEffects();
     if (!isFinalOrConst) setDependsOnSomething();
   }
 
   int typeCode() => 27;
   bool typeEquals(other) => other is HFieldGet;
   bool dataEquals(HFieldGet other) => element == other.element;
-  String toString() => "FieldGet $element";
+  String toString() => "FieldGet ${element == null ? fieldName : element}";
 }
 
 class HFieldSet extends HFieldAccess {
-  HFieldSet(Element element, HInstruction receiver, HInstruction value)
-      : super(element, <HInstruction>[receiver, value]);
+  HFieldSet(SourceString name,
+            LibraryElement library,
+            HInstruction receiver,
+            HInstruction value)
+      : super(name, library, <HInstruction>[receiver, value]);
+
+  HFieldSet.withElement(Element element,
+                        HInstruction receiver,
+                        HInstruction value)
+      : super.withElement(element, <HInstruction>[receiver, value]);
 
   HInstruction get receiver() => inputs[0];
   HInstruction get value() => inputs[1];
   accept(HVisitor visitor) => visitor.visitFieldSet(this);
 
   void prepareGvn() {
     // TODO(ngeoffray): implement more fine grained side effects.
     setAllSideEffects();
   }
 
   final bool isStatement = true;
-  String toString() => "FieldSet $element";
+  String toString() => "FieldSet ${element == null ? fieldName : element}";
 }
 
 class HLocalGet extends HFieldGet {
-  HLocalGet(Element element, HLocalValue local) : super(element, local);
+  HLocalGet(Element element, HLocalValue local)
+      : super.withElement(element, local);
 
   accept(HVisitor visitor) => visitor.visitLocalGet(this);
 
   HLocalValue get local() => inputs[0];
 
   void prepareGvn() {
     setUseGvn();
     // TODO(floitsch): if the variable is not captured then it only depends
     // on assignments to the same variable. Otherwise we need to see if the
     // variable is mutated inside closures.
     setDependsOnSomething();
   }
 }
 
 class HLocalSet extends HFieldSet {
   HLocalSet(Element element, HLocalValue local, HInstruction value)
-      : super(element, local, value);
+      : super.withElement(element, local, value);
 
   accept(HVisitor visitor) => visitor.visitLocalSet(this);
 
   HLocalValue get local() => inputs[0];
 
   void prepareGvn() {
     // TODO(floitsch): implement more fine grained side effects.
     setAllSideEffects();
   }
 }
@@ skipping 1299 matching lines @@
   HBasicBlock get start() => expression.start;
   HBasicBlock get end() {
     // We don't create a switch block if there are no cases.
     assert(!statements.isEmpty());
     return statements.last().end;
   }
 
   bool accept(HStatementInformationVisitor visitor) =>
       visitor.visitSwitchInfo(this);
 }