Add explicit smi-checks to smi comparisons.

runtime/vm/intermediate_language.h

Index: runtime/vm/intermediate_language.h
===================================================================
--- runtime/vm/intermediate_language.h	(revision 11611)
+++ runtime/vm/intermediate_language.h	(working copy)
@@ -1939,8 +1939,8 @@
 
 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;
   }
@@ -1958,10 +1958,10 @@
 
   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);
 };