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 1921 matching lines @@
 
  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);

[srdjan, 2012/08/30 18:36:12]

Assert that original_deopt_is  valid (not kNoDeoptId).

[Florian Schneider, 2012/09/03 09:25:09]

Done.

     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(); }
+  intptr_t deopt_id() const { return original_deopt_id_; }

[srdjan, 2012/08/30 18:36:12]

Super class has a method deopt_id that is not virtual. Maybe rename this to
original_deopt_id.

[Florian Schneider, 2012/09/03 09:25:09]

Done. This is fragile right now: Computation::deopt_id() gives the wrong id for
this instruction. I'm making it virtual for now, but will move deopt_id() away
from Computation into only those subclasses that need it.

 
  private:
-  InstanceCallComp* original_;
+  intptr_t original_deopt_id_;

[srdjan, 2012/08/30 18:36:12]

const

[Florian Schneider, 2012/09/03 09:25:09]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(CheckSmiComp);
 };
 
 
 class CheckArrayBoundComp : public TemplateComputation<2> {
  public:
   CheckArrayBoundComp(Value* array,
                       Value* index,
                       intptr_t array_type,
@@ skipping 1207 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_