Add a smi-check instruction for arithmetic smi operations.

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 85 matching lines @@
   M(CatchEntry, CatchEntryComp)                                                \
   M(BinarySmiOp, BinarySmiOpComp)                                              \
   M(BinaryMintOp, BinaryMintOpComp)                                            \
   M(BinaryDoubleOp, BinaryDoubleOpComp)                                        \
   M(UnarySmiOp, UnarySmiOpComp)                                                \
   M(NumberNegate, NumberNegateComp)                                            \
   M(CheckStackOverflow, CheckStackOverflowComp)                                \
   M(DoubleToDouble, DoubleToDoubleComp)                                        \
   M(SmiToDouble, SmiToDoubleComp)                                              \
   M(CheckClass, CheckClassComp)                                                \
+  M(CheckSmi, CheckSmiComp)                                                    \
   M(Materialize, MaterializeComp)
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
 FOR_EACH_VALUE(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 // Forward declarations.
 class BindInstr;
@@ skipping 29 matching lines @@
   virtual Value* InputAt(intptr_t i) const = 0;
   virtual void SetInputAt(intptr_t i, Value* value) = 0;
 
   // Call computations override this function and return the
   // number of pushed arguments.
   virtual intptr_t ArgumentCount() const = 0;
 
   // Returns true, if this computation can deoptimize.
   virtual bool CanDeoptimize() const  = 0;
 
-  // Optimize this computation. Returns a replacement for the instruction
-  // that wraps this computation or NULL if nothing to replace.
-  virtual Definition* TryReplace(BindInstr* instr) { return NULL; }
+  // Returns a replacement for the instruction that wraps this computation.
+  // By default return its input parameter (no replacement).

[srdjan, 2012/08/22 15:56:51]

'its input parameter' is not that clear to me. I thought it is the computation's
input parameter being returned.

[Florian Schneider, 2012/08/23 07:53:15]

I changed the comment. The old behaviour was that a NULL return value menas that
nothing changes. Now NULL means that the instructions will be removed.

+  // Returns NULL if instr can be eliminated.
+  virtual Definition* TryReplace(BindInstr* instr) const;
 
   // Compares two computations. Returns true, if:
   // 1. They are of the same kind.
   // 2. All input operands match.
   // 3. All other attributes match.
   bool Equals(Computation* other) const;
 
   // Returns a hash code for use with hash maps.
   virtual intptr_t Hashcode() const;
 
@@ skipping 597 matching lines @@
       : ComparisonComp(kind, left, right) {
     ASSERT((kind == Token::kEQ_STRICT) || (kind == Token::kNE_STRICT));
   }
 
   DECLARE_COMPUTATION(StrictCompare)
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
-  virtual Definition* TryReplace(BindInstr* instr);
+  virtual Definition* TryReplace(BindInstr* instr) const;
+
   virtual intptr_t ResultCid() const { return kBoolCid; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StrictCompareComp);
 };
 
 
 class EqualityCompareComp : public ComparisonComp {
  public:
   EqualityCompareComp(intptr_t token_pos,
@@ skipping 1097 matching lines @@
 
   virtual bool AttributesEqual(Computation* other) const;
 
   virtual bool HasSideEffect() const { return false; }
 
   Value* value() const { return inputs_[0]; }
 
   intptr_t deopt_id() const { return original_->deopt_id(); }
   intptr_t try_index() const { return original_->try_index(); }
 
+  virtual void PrintOperandsTo(BufferFormatter* f) const;
+
  private:
   InstanceCallComp* original_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckClassComp);
 };
 
 
+class CheckSmiComp : public TemplateComputation<1> {
+ public:
+  CheckSmiComp(Value* value, InstanceCallComp* original)
+      : original_(original) {
+    ASSERT(value != NULL);
+    inputs_[0] = value;
+  }
+
+  DECLARE_COMPUTATION(CheckSmi)
+
+  virtual bool CanDeoptimize() const { return true; }
+
+  virtual bool AttributesEqual(Computation* other) const { return true; }
+
+  virtual bool HasSideEffect() const { return false; }
+
+  virtual Definition* TryReplace(BindInstr* instr) const;
+
+  Value* value() const { return inputs_[0]; }
+
+  intptr_t deopt_id() const { return original_->deopt_id(); }
+  intptr_t try_index() const { return original_->try_index(); }
+
+ private:
+  InstanceCallComp* original_;
+
+  DISALLOW_COPY_AND_ASSIGN(CheckSmiComp);
+};
+
+
 #undef DECLARE_COMPUTATION
 
 
 // Implementation of type testers and cast functins.
 #define DEFINE_COMPUTATION_PREDICATE(ShortName, ClassName)                     \
 bool Computation::Is##ShortName() const {                                      \
   return computation_kind() == k##ShortName;                                   \
 }                                                                              \
 const ClassName* Computation::As##ShortName() const {                          \
   if (!Is##ShortName()) return NULL;                                           \
@@ skipping 1146 matching lines @@
 
   Location* LocationSlotAt(intptr_t ix) const {
     ASSERT((ix >= 0) && (ix < values_.length()));
     return &locations_[ix];
   }
 
   intptr_t fixed_parameter_count() const {
     return fixed_parameter_count_;
   }
 
+  Environment* Copy() const;
+
   void PrintTo(BufferFormatter* f) const;
 
  private:
+  Environment(intptr_t length, intptr_t fixed_parameter_count)
+      : values_(length),
+        locations_(NULL),
+        fixed_parameter_count_(fixed_parameter_count) { }
+
   GrowableArray<Value*> values_;
   Location* locations_;
   const intptr_t fixed_parameter_count_;
 
   DISALLOW_COPY_AND_ASSIGN(Environment);
 };
 
 
 // Visitor base class to visit each instruction and computation in a flow
 // graph as defined by a reversed list of basic blocks.
@@ skipping 30 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_