Move types out of the HInstructions.

lib/compiler/implementation/ssa/codegen_helpers.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.
 
 /**
  * Instead of emitting each SSA instruction with a temporary variable
  * mark instructions that can be emitted at their use-site.
  * For example, in:
  *   t0 = 4;
  *   t1 = 3;
  *   t2 = add(t0, t1);
  * t0 and t1 would be marked and the resulting code would then be:
  *   t2 = add(4, 3);
  */
 class SsaInstructionMerger extends HBaseVisitor {
+  HTypeMap types;
   List<HInstruction> expectedInputs;
   Set<HInstruction> generateAtUseSite;
 
   void markAsGenerateAtUseSite(HInstruction instruction) {
-    assert(!instruction.isStatement);
+    assert(!instruction.isStatement(types));
     generateAtUseSite.add(instruction);
   }
 
-  SsaInstructionMerger(this.generateAtUseSite);
+  SsaInstructionMerger(this.types, this.generateAtUseSite);
 
   void visitGraph(HGraph graph) {
     visitDominatorTree(graph);
   }
 
   void visitInstruction(HInstruction instruction) {
     // A code motion invariant instruction is dealt before visiting it.
     assert(!instruction.isCodeMotionInvariant());
     for (HInstruction input in instruction.inputs) {
       if (!generateAtUseSite.contains(input)
@@ skipping 14 matching lines @@
   void visitCheck(HCheck instruction) {}
 
   // A type guard should not generate its input at use site, otherwise
   // they would not be alive.
   void visitTypeGuard(HTypeGuard instruction) {}
 
   // If an equality operation is builtin it must only have its inputs generated
   // at use site if it does not require an expression with repeated uses
   // (because of null / undefined).
   void visitEquals(HEquals instruction) {
-    if (!instruction.builtin ||
-        singleIdentityComparison(instruction.left, instruction.right) != null) {
+    HInstruction left = instruction.left;
+    HInstruction right = instruction.right;
+    if (!instruction.isBuiltin(types) ||
+        singleIdentityComparison(left, right, types) != null) {
       super.visitEquals(instruction);
     }
     // Do nothing.
   }
 
   // An identity operation must only have its inputs generated at use site if
   // does not require an expression with multiple uses (because of null /
   // undefined).
   void visitIdentity(HIdentity instruction) {
-    if (singleIdentityComparison(instruction.left, instruction.right) != null) {
+    HInstruction left = instruction.left;
+    HInstruction right = instruction.right;
+    if (singleIdentityComparison(left, right, types) != null) {
       super.visitIdentity(instruction);
     }
     // Do nothing.
   }
 
   void visitTypeConversion(HTypeConversion instruction) {
     if (!instruction.isChecked) {
       markAsGenerateAtUseSite(instruction);
     } else if (instruction.isCheckedModeCheck) {
       // Checked mode checks compile to code that only use their input
@@ skipping 49 matching lines @@
     for (HInstruction instruction = block.last.previous;
          instruction !== null;
          instruction = instruction.previous) {
       if (generateAtUseSite.contains(instruction)) {
         continue;
       }
       if (instruction.isCodeMotionInvariant()) {
         markAsGenerateAtUseSite(instruction);
         continue;
       }
-      if (instruction.isStatement) {
+      if (instruction.isStatement(types)) {
         expectedInputs.clear();
       }
       // See if the current instruction is the next non-trivial
       // expected input.
       if (findInInputsAndPopNonMatching(instruction)) {
         tryGenerateAtUseSite(instruction);
       } else {
         assert(expectedInputs.isEmpty());
       }
       instruction.accept(this);
     }
 
     if (block.predecessors.length === 1
         && isBlockSinglePredecessor(block.predecessors[0])) {
       assert(block.phis.isEmpty());
       tryMergingExpressions(block.predecessors[0]);
     } else {
       expectedInputs = null;
     }
   }
 }
 
 /**
  *  Detect control flow arising from short-circuit logical and
  *  conditional operators, and prepare the program to be generated
  *  using these operators instead of nested ifs and boolean variables.
  */
 class SsaConditionMerger extends HGraphVisitor {
+  final HTypeMap types;
   Set<HInstruction> generateAtUseSite;
   Set<HInstruction> controlFlowOperators;
 
   void markAsGenerateAtUseSite(HInstruction instruction) {
-    assert(!instruction.isStatement);
+    assert(!instruction.isStatement(types));
     generateAtUseSite.add(instruction);
   }
 
-  SsaConditionMerger(this.generateAtUseSite, this.controlFlowOperators);
+  SsaConditionMerger(this.types,
+                     this.generateAtUseSite,
+                     this.controlFlowOperators);
 
   void visitGraph(HGraph graph) {
     visitPostDominatorTree(graph);
   }
 
   /**
    * Check if a block has at least one statement other than
    * [instruction].
    */
   bool hasAnyStatement(HBasicBlock block, HInstruction instruction) {
@@ skipping 69 matching lines @@
 
     if (end == null) return;
     if (end.phis.isEmpty()) return;
     if (end.phis.first !== end.phis.last) return;
     HBasicBlock elseBlock = startIf.elseBlock;
 
     if (end.predecessors[1] !== elseBlock) return;
     HPhi phi = end.phis.first;
     HInstruction thenInput = phi.inputs[0];
     HInstruction elseInput = phi.inputs[1];
-    if (thenInput.isStatement || elseInput.isStatement) return;
+    if (thenInput.isStatement(types) || elseInput.isStatement(types)) return;
 
     if (hasAnyStatement(elseBlock, elseInput)) return;
     assert(elseBlock.successors.length == 1);
     assert(end.predecessors.length == 2);
 
     HBasicBlock thenBlock = startIf.thenBlock;
     // Skip trivial goto blocks.
     while (thenBlock.successors[0] != end && thenBlock.first is HGoto) {
       thenBlock = thenBlock.successors[0];
     }
@@ skipping 40 matching lines @@
     }
 
     // If [thenInput] is defined in the first predecessor, then it is only used
     // by [phi] and can be generated at use site.
     if (thenInput.block === end.predecessors[0]) {
       assert(thenInput.usedBy.length == 1);
       markAsGenerateAtUseSite(thenInput);
     }
   }
 }