Unify class ids and snapshot object ids list so that we don't have disparate and sometimes confusin…

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 611 matching lines @@
 class EqualityCompareComp : public ComparisonComp {
  public:
   EqualityCompareComp(intptr_t token_pos,
                       intptr_t try_index,
                       Token::Kind kind,
                       Value* left,
                       Value* right)
       : ComparisonComp(kind, left, right),
         token_pos_(token_pos),
         try_index_(try_index),
-        receiver_class_id_(kObject) {
+        receiver_class_id_(kObjectCid) {
     ASSERT((kind == Token::kEQ) || (kind == Token::kNE));
   }
 
   DECLARE_COMPUTATION(EqualityCompare)
 
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
 
   void set_receiver_class_id(intptr_t value) { receiver_class_id_ = value; }
   intptr_t receiver_class_id() const { return receiver_class_id_; }
@@ skipping 13 matching lines @@
 class RelationalOpComp : public ComparisonComp {
  public:
   RelationalOpComp(intptr_t token_pos,
                    intptr_t try_index,
                    Token::Kind kind,
                    Value* left,
                    Value* right)
       : ComparisonComp(kind, left, right),
         token_pos_(token_pos),
         try_index_(try_index),
-        operands_class_id_(kObject) {
+        operands_class_id_(kObjectCid) {
     ASSERT(Token::IsRelationalOperator(kind));
   }
 
   DECLARE_COMPUTATION(RelationalOp)
 
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
 
   // TODO(srdjan): instead of class-id pass an enum that can differentiate
   // between boxed and unboxed doubles and integers.
@@ skipping 266 matching lines @@
 
 
 class LoadIndexedComp : public TemplateComputation<2> {
  public:
   LoadIndexedComp(intptr_t token_pos,
                   intptr_t try_index,
                   Value* array,
                   Value* index)
       : token_pos_(token_pos),
         try_index_(try_index),
-        receiver_type_(kIllegalObjectKind) {
+        receiver_type_(kIllegalCid) {
     ASSERT(array != NULL);
     ASSERT(index != NULL);
     inputs_[0] = array;
     inputs_[1] = index;
   }
 
   DECLARE_COMPUTATION(LoadIndexed)
 
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
   Value* array() const { return inputs_[0]; }
   Value* index() const { return inputs_[1]; }
 
-  void set_receiver_type(ObjectKind receiver_type) {
+  void set_receiver_type(intptr_t receiver_type) {
     receiver_type_ = receiver_type;
   }
 
-  ObjectKind receiver_type() const {
+  intptr_t receiver_type() const {
     return receiver_type_;
   }
 
   virtual bool CanDeoptimize() const { return true; }
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
-  ObjectKind receiver_type_;
+  intptr_t receiver_type_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadIndexedComp);
 };
 
 
 // Not simply an InstanceCall because it has somewhat more complicated
 // semantics: the value operand is preserved before the call.
 class StoreIndexedComp : public TemplateComputation<3> {
  public:
   StoreIndexedComp(intptr_t token_pos,
                    intptr_t try_index,
                    Value* array,
                    Value* index,
                    Value* value)
       : token_pos_(token_pos),
         try_index_(try_index),
-        receiver_type_(kIllegalObjectKind) {
+        receiver_type_(kIllegalCid) {
     inputs_[0] = array;
     inputs_[1] = index;
     inputs_[2] = value;
   }
 
   DECLARE_COMPUTATION(StoreIndexed)
 
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
   Value* array() const { return inputs_[0]; }
   Value* index() const { return inputs_[1]; }
   Value* value() const { return inputs_[2]; }
 
-  void set_receiver_type(ObjectKind receiver_type) {
+  void set_receiver_type(intptr_t receiver_type) {
     receiver_type_ = receiver_type;
   }
 
-  ObjectKind receiver_type() const {
+  intptr_t receiver_type() const {
     return receiver_type_;
   }
 
   virtual bool CanDeoptimize() const { return true; }
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
-  ObjectKind receiver_type_;
+  intptr_t receiver_type_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreIndexedComp);
 };
 
 
 // Note overrideable, built-in: value? false : true.
 class BooleanNegateComp : public TemplateComputation<1> {
  public:
   explicit BooleanNegateComp(Value* value) {
     inputs_[0] = value;
@@ skipping 608 matching lines @@
   const intptr_t token_pos_;
   const intptr_t try_index_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckStackOverflowComp);
 };
 
 
 class ToDoubleComp : public TemplateComputation<1> {
  public:
   ToDoubleComp(Value* value,
-               ObjectKind from,
+               intptr_t from,
                InstanceCallComp* instance_call)
       : from_(from), instance_call_(instance_call) {
     ASSERT(value != NULL);
     inputs_[0] = value;
   }
 
   Value* value() const { return inputs_[0]; }
-  ObjectKind from() const { return from_; }
+  intptr_t from() const { return from_; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   DECLARE_COMPUTATION(ToDouble)
 
   virtual bool CanDeoptimize() const { return true; }
 
  private:
-  const ObjectKind from_;
+  const intptr_t from_;
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(ToDoubleComp);
 };
 
 
 #undef DECLARE_COMPUTATION
 
 
 // Implementation of type testers and cast functins.
@@ skipping 1082 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_