Add explicit smi-checks to smi comparisons.

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 118 matching lines @@
 
 class Computation : public ZoneAllocated {
  public:
   Computation() : deopt_id_(Isolate::kNoDeoptId), ic_data_(NULL), locs_(NULL) {
     Isolate* isolate = Isolate::Current();
     deopt_id_ = isolate->GetNextDeoptId();
     ic_data_ = isolate->GetICDataForDeoptId(deopt_id_);
   }
 
   // Unique id used for deoptimization.
-  intptr_t deopt_id() const {
+  virtual intptr_t deopt_id() const {
     ASSERT(CanDeoptimize());
     return deopt_id_;
   }
 
   const ICData* ic_data() const { return ic_data_; }
   void set_ic_data(const ICData* value) { ic_data_ = value; }
   bool HasICData() const {
     return (ic_data() != NULL) && !ic_data()->IsNull();
   }
 
@@ skipping 1767 matching lines @@
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const { return kIllegalCid; }
 
   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(); }
+  virtual intptr_t deopt_id() const { return original_->deopt_id(); }
 
   virtual Definition* TryReplace(BindInstr* instr) const;
 
   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) {
+  CheckSmiComp(Value* value, intptr_t original_deopt_id)
+      : original_deopt_id_(original_deopt_id) {
     ASSERT(value != NULL);
+    ASSERT(original_deopt_id != Isolate::kNoDeoptId);
     inputs_[0] = value;
   }
 
   DECLARE_COMPUTATION(CheckSmi)
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const { return kIllegalCid; }
 
   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(); }
+  virtual intptr_t deopt_id() const { return original_deopt_id_; }
 
  private:
-  InstanceCallComp* original_;
+  const intptr_t original_deopt_id_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckSmiComp);
 };
 
 
 class CheckArrayBoundComp : public TemplateComputation<2> {
  public:
   CheckArrayBoundComp(Value* array,
                       Value* index,
                       intptr_t array_type,
@@ skipping 12 matching lines @@
 
   virtual bool AttributesEqual(Computation* other) const;
 
   virtual bool HasSideEffect() const { return false; }
 
   Value* array() const { return inputs_[0]; }
   Value* index() const { return inputs_[1]; }
 
   intptr_t array_type() const { return array_type_; }
 
-  intptr_t deopt_id() const { return original_->deopt_id(); }
+  virtual intptr_t deopt_id() const { return original_->deopt_id(); }
 
  private:
   intptr_t array_type_;
   InstanceCallComp* original_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckArrayBoundComp);
 };
 
 
 #undef DECLARE_COMPUTATION
@@ skipping 1174 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_