Introduce HLocalValue and HLocalGet/Set.

lib/compiler/implementation/ssa/nodes.dart

Index: lib/compiler/implementation/ssa/nodes.dart
diff --git a/lib/compiler/implementation/ssa/nodes.dart b/lib/compiler/implementation/ssa/nodes.dart
index ac2b3e8476ea3ec39edf122906df7d7c2fc4d7a3..67dea1cacb6dcf14142fd08923a36cc635132317 100644
--- a/lib/compiler/implementation/ssa/nodes.dart
+++ b/lib/compiler/implementation/ssa/nodes.dart
@@ -39,6 +39,9 @@ interface HVisitor<R> {
   R visitLess(HLess node);
   R visitLessEqual(HLessEqual node);
   R visitLiteralList(HLiteralList node);
+  R visitLocalGet(HLocalGet node);
+  R visitLocalSet(HLocalSet node);
+  R visitLocalValue(HLocalValue node);
   R visitLoopBranch(HLoopBranch node);
   R visitModulo(HModulo node);
   R visitMultiply(HMultiply node);
@@ -249,6 +252,7 @@ class HBaseVisitor extends HGraphVisitor implements HVisitor {
   visitInvokeUnary(HInvokeUnary node) => visitInvokeStatic(node);
   visitConditionalBranch(HConditionalBranch node) => visitControlFlow(node);
   visitControlFlow(HControlFlow node) => visitInstruction(node);
+  visitFieldAccess(HFieldAccess node) => visitInstruction(node);
   visitRelational(HRelational node) => visitInvokeBinary(node);
 
   visitAdd(HAdd node) => visitBinaryArithmetic(node);
@@ -265,8 +269,8 @@ class HBaseVisitor extends HGraphVisitor implements HVisitor {
   visitDivide(HDivide node) => visitBinaryArithmetic(node);
   visitEquals(HEquals node) => visitRelational(node);
   visitExit(HExit node) => visitControlFlow(node);
-  visitFieldGet(HFieldGet node) => visitInstruction(node);
-  visitFieldSet(HFieldSet node) => visitInstruction(node);
+  visitFieldGet(HFieldGet node) => visitFieldAccess(node);
+  visitFieldSet(HFieldSet node) => visitFieldAccess(node);
   visitForeign(HForeign node) => visitInstruction(node);
   visitForeignNew(HForeignNew node) => visitForeign(node);
   visitGoto(HGoto node) => visitControlFlow(node);
@@ -293,13 +297,16 @@ class HBaseVisitor extends HGraphVisitor implements HVisitor {
   visitLess(HLess node) => visitRelational(node);
   visitLessEqual(HLessEqual node) => visitRelational(node);
   visitLiteralList(HLiteralList node) => visitInstruction(node);
+  visitLocalGet(HLocalGet node) => visitFieldGet(node);
+  visitLocalSet(HLocalSet node) => visitFieldSet(node);
+  visitLocalValue(HLocalValue node) => visitInstruction(node);
   visitLoopBranch(HLoopBranch node) => visitConditionalBranch(node);
   visitModulo(HModulo node) => visitBinaryArithmetic(node);
   visitNegate(HNegate node) => visitInvokeUnary(node);
   visitNot(HNot node) => visitInstruction(node);
   visitPhi(HPhi node) => visitInstruction(node);
   visitMultiply(HMultiply node) => visitBinaryArithmetic(node);
-  visitParameterValue(HParameterValue node) => visitInstruction(node);
+  visitParameterValue(HParameterValue node) => visitLocalValue(node);
   visitReturn(HReturn node) => visitControlFlow(node);
   visitShiftRight(HShiftRight node) => visitBinaryBitOp(node);
   visitShiftLeft(HShiftLeft node) => visitBinaryBitOp(node);
@@ -1294,6 +1301,36 @@ class HFieldSet extends HFieldAccess {
   bool isStatement() => true;
 }
 
+class HLocalGet extends HFieldGet {
+  HLocalGet(Element element, HLocalValue local) : super(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);
+
+  accept(HVisitor visitor) => visitor.visitLocalSet(this);
+
+  HLocalValue get local() => inputs[0];
+
+  void prepareGvn() {
+    // TODO(floitsch): implement more fine grain side effects.

[kasperl, 2012/06/19 11:19:45]

grained

[floitsch, 2012/06/19 11:31:33]

Done.

+    setAllSideEffects();
+  }
+}
+
 class HForeign extends HInstruction {
   final DartString code;
   final HType foreignType;
@@ -1821,17 +1858,28 @@ class HNot extends HInstruction {
   bool dataEquals(HInstruction other) => true;
 }
 
-class HParameterValue extends HInstruction {
-  HParameterValue(element) : super(<HInstruction>[]) {
+/**
+  * An [HLocalValue] represents a local. Contrary to [HParameterValue]s its

[Lasse Reichstein Nielsen, 2012/06/19 11:27:51]

Do you mean "contrary", i.e., that a HParameterValue must NOT be used first in a
HLocalSet? Or just "unlike"?

[floitsch, 2012/06/19 11:31:33]

Unlike. done.

+  * first use must be in an HLocalSet.
+  */
+class HLocalValue extends HInstruction {
+  HLocalValue(element) : super(<HInstruction>[]) {
     sourceElement = element;
   }
 
   void prepareGvn() {
     assert(!hasSideEffects());
   }
+  toString() => 'local ${sourceElement.name}';
+  accept(HVisitor visitor) => visitor.visitLocalValue(this);
+  bool isCodeMotionInvariant() => true;
+}
+
+class HParameterValue extends HLocalValue {
+  HParameterValue(element) : super(element);
+
   toString() => 'parameter ${sourceElement.name}';
   accept(HVisitor visitor) => visitor.visitParameterValue(this);
-  bool isCodeMotionInvariant() => true;
 }
 
 class HThis extends HParameterValue {