Revert r11772: Add check for non-smi to the IL and use it for class checks.

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 1276 matching lines @@
   M(CatchEntry, CatchEntryComp)                                                \
   M(BinarySmiOp, BinarySmiOpComp)                                              \
   M(BinaryMintOp, BinaryMintOpComp)                                            \
   M(UnarySmiOp, UnarySmiOpComp)                                                \
   M(NumberNegate, NumberNegateComp)                                            \
   M(CheckStackOverflow, CheckStackOverflowComp)                                \
   M(DoubleToDouble, DoubleToDoubleComp)                                        \
   M(SmiToDouble, SmiToDoubleComp)                                              \
   M(CheckClass, CheckClassComp)                                                \
   M(CheckSmi, CheckSmiComp)                                                    \
-  M(CheckNonSmi, CheckNonSmiComp)                                              \
   M(Constant, ConstantComp)                                                    \
   M(CheckEitherNonSmi, CheckEitherNonSmiComp)                                  \
   M(UnboxedDoubleBinaryOp, UnboxedDoubleBinaryOpComp)                          \
   M(UnboxDouble, UnboxDoubleComp)                                              \
   M(BoxDouble, BoxDoubleComp)                                                  \
   M(CheckArrayBound, CheckArrayBoundComp)
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
@@ skipping 1934 matching lines @@
 
   virtual intptr_t deopt_id() const { return original_deopt_id_; }
 
  private:
   const intptr_t original_deopt_id_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckSmiComp);
 };
 
 
-class CheckNonSmiComp : public TemplateComputation<1> {
- public:
-  CheckNonSmiComp(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(CheckNonSmi)
-
-  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; }
-
-  Value* value() const { return inputs_[0]; }
-
-  virtual intptr_t deopt_id() const { return original_deopt_id_; }
-
- private:
-  const intptr_t original_deopt_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(CheckNonSmiComp);
-};
-
-
 class CheckArrayBoundComp : public TemplateComputation<2> {
  public:
   CheckArrayBoundComp(Value* array,
                       Value* index,
                       intptr_t array_type,
                       InstanceCallComp* instance_call)
       : array_type_(array_type), instance_call_(instance_call) {
     ASSERT(array != NULL);
     ASSERT(index != NULL);
     inputs_[0] = array;
@@ skipping 130 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_