Canonicalize away simple arithmetic equivalences.

runtime/vm/intermediate_language.h

 // 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.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 3501 matching lines @@
   virtual bool HasSideEffect() const { return false; }
 
   virtual intptr_t ResultCid() const;
 
   virtual RawAbstractType* CompileType() const;
 
   virtual Representation representation() const {
     return kUnboxedMint;
   }
 
+
   virtual bool AffectedBySideEffect() const { return false; }
   virtual bool AttributesEqual(Instruction* other) const { return true; }
 
   DECLARE_INSTRUCTION(UnboxInteger)
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UnboxIntegerInstr);
 };
 
 
@@ skipping 37 matching lines @@
   virtual RawAbstractType* CompileType() const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MathSqrtInstr);
 };
 
 
 class BinaryDoubleOpInstr : public TemplateDefinition<2> {
  public:
   BinaryDoubleOpInstr(Token::Kind op_kind,
-                             Value* left,
-                             Value* right,
-                             InstanceCallInstr* instance_call)
+                      Value* left,
+                      Value* right,
+                      InstanceCallInstr* instance_call)
       : op_kind_(op_kind) {
     ASSERT(left != NULL);
     ASSERT(right != NULL);
     inputs_[0] = left;
     inputs_[1] = right;
     deopt_id_ = instance_call->deopt_id();
   }
 
   Value* left() const { return inputs_[0]; }
   Value* right() const { return inputs_[1]; }
@@ skipping 25 matching lines @@
 
   virtual intptr_t DeoptimizationTarget() const {
     // Direct access since this instruction cannot deoptimize, and the deopt-id
     // was inherited from another instruction that could deoptimize.
     return deopt_id_;
   }
 
   DECLARE_INSTRUCTION(BinaryDoubleOp)
   virtual RawAbstractType* CompileType() const;
 
+  virtual Definition* Canonicalize(FlowGraphOptimizer* optimizer);
+
  private:
   const Token::Kind op_kind_;
 
   DISALLOW_COPY_AND_ASSIGN(BinaryDoubleOpInstr);
 };
 
 
 class BinaryMintOpInstr : public TemplateDefinition<2> {
  public:
   BinaryMintOpInstr(Token::Kind op_kind,
@@ skipping 38 matching lines @@
     ASSERT((idx == 0) || (idx == 1));
     return kUnboxedMint;
   }
 
   virtual intptr_t DeoptimizationTarget() const {
     // Direct access since this instruction cannot deoptimize, and the deopt-id
     // was inherited from another instruction that could deoptimize.
     return deopt_id_;
   }
 
+  virtual Definition* Canonicalize(FlowGraphOptimizer* optimizer);
+
   DECLARE_INSTRUCTION(BinaryMintOp)
 
  private:
   const Token::Kind op_kind_;
 
   DISALLOW_COPY_AND_ASSIGN(BinaryMintOpInstr);
 };
 
 
 class ShiftMintOpInstr : public TemplateDefinition<2> {
@@ skipping 151 matching lines @@
   virtual intptr_t ResultCid() const;
 
   void set_overflow(bool overflow) {
     overflow_ = overflow;
   }
 
   void PrintTo(BufferFormatter* f) const;
 
   virtual void InferRange();
 
+  virtual Definition* Canonicalize(FlowGraphOptimizer* optimizer);
+
  private:
   const Token::Kind op_kind_;
   InstanceCallInstr* instance_call_;
   bool overflow_;
 
   DISALLOW_COPY_AND_ASSIGN(BinarySmiOpInstr);
 };
 
 
 // Handles both Smi operations: BIT_OR and NEGATE.
@@ skipping 459 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_