Get rid of ast node ids.

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 99 matching lines @@
 class BindInstr;
 class BranchInstr;
 class BufferFormatter;
 class ComparisonComp;
 class Instruction;
 class PushArgumentInstr;
 class Value;
 
 class Computation : public ZoneAllocated {
  public:
-  static const intptr_t kNoCid = -1;
-
-  Computation() : cid_(kNoCid), ic_data_(NULL), locs_(NULL) {
+  Computation() : deopt_id_(Isolate::kNoDeoptId), ic_data_(NULL), locs_(NULL) {
     Isolate* isolate = Isolate::Current();
-    cid_ = isolate->GetNextCid();
-    ic_data_ = isolate->GetICDataForCid(cid_);
+    deopt_id_ = isolate->GetNextDeoptId();
+    ic_data_ = isolate->GetICDataForDeoptId(deopt_id_);
   }
 
-  // Unique computation/instruction id, used for deoptimization.
-  intptr_t cid() const { return cid_; }
+  // Unique id used for deoptimization.
+  intptr_t deopt_id() const { return deopt_id_; }
 
   ICData* ic_data() const { return ic_data_; }
   void set_ic_data(ICData* value) { ic_data_ = value; }
   bool HasICData() const {
     return (ic_data() != NULL) && !ic_data()->IsNull();
   }
 
   // Visiting support.
   virtual void Accept(FlowGraphVisitor* visitor, BindInstr* instr) = 0;
 
@@ skipping 57 matching lines @@
 
   // Declare predicate for each computation.
 #define DECLARE_PREDICATE(ShortName, ClassName)                                \
   inline bool Is##ShortName() const;                                           \
   inline const ClassName* As##ShortName() const;                               \
   inline ClassName* As##ShortName();
 FOR_EACH_COMPUTATION(DECLARE_PREDICATE)
 #undef DECLARE_PREDICATE
 
  private:
-  intptr_t cid_;
+  intptr_t deopt_id_;
   ICData* ic_data_;
   LocationSummary* locs_;
 
   DISALLOW_COPY_AND_ASSIGN(Computation);
 };
 
 
 // An embedded container with N elements of type T.  Used (with partial
 // specialization for N=0) because embedded arrays cannot have size 0.
 template<typename T, intptr_t N>
@@ skipping 2216 matching lines @@
   Value* value_;
 
   DISALLOW_COPY_AND_ASSIGN(PushArgumentInstr);
 };
 
 
 class ReturnInstr : public InstructionWithInputs {
  public:
   ReturnInstr(intptr_t token_pos, Value* value)
       : InstructionWithInputs(),
-        cid_(Isolate::Current()->GetNextCid()),
+        deopt_id_(Isolate::Current()->GetNextDeoptId()),
         token_pos_(token_pos),
         value_(value) {
     ASSERT(value_ != NULL);
   }
 
   DECLARE_INSTRUCTION(Return)
 
   virtual intptr_t ArgumentCount() const { return 0; }
 
-  intptr_t cid() const { return cid_; }
+  intptr_t deopt_id() const { return deopt_id_; }
   intptr_t token_pos() const { return token_pos_; }
   Value* value() const { return value_; }
 
   virtual LocationSummary* MakeLocationSummary() const;
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler);
 
   virtual bool CanDeoptimize() const { return false; }
 
  private:
-  const intptr_t cid_;  // Computation/instruction id.
+  const intptr_t deopt_id_;
   const intptr_t token_pos_;
   Value* value_;
 
   DISALLOW_COPY_AND_ASSIGN(ReturnInstr);
 };
 
 
 class ThrowInstr : public InstructionWithInputs {
  public:
   ThrowInstr(intptr_t token_pos, intptr_t try_index)
       : InstructionWithInputs(),
-        cid_(Isolate::Current()->GetNextCid()),
+        deopt_id_(Isolate::Current()->GetNextDeoptId()),
         token_pos_(token_pos),
         try_index_(try_index) { }
 
   DECLARE_CALL_INSTRUCTION(Throw)
 
   virtual intptr_t ArgumentCount() const { return 1; }
 
-  intptr_t cid() const { return cid_; }
+  intptr_t deopt_id() const { return deopt_id_; }
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
 
   virtual LocationSummary* MakeLocationSummary() const;
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler);
 
   virtual bool CanDeoptimize() const { return false; }
 
  private:
-  const intptr_t cid_;  // Computation/instruction id.
+  const intptr_t deopt_id_;
   const intptr_t token_pos_;
   const intptr_t try_index_;
 
   DISALLOW_COPY_AND_ASSIGN(ThrowInstr);
 };
 
 
 class ReThrowInstr : public InstructionWithInputs {
  public:
   ReThrowInstr(intptr_t token_pos,
                intptr_t try_index)
       : InstructionWithInputs(),
-        cid_(Isolate::Current()->GetNextCid()),
+        deopt_id_(Isolate::Current()->GetNextDeoptId()),
         token_pos_(token_pos),
         try_index_(try_index) { }
 
   DECLARE_CALL_INSTRUCTION(ReThrow)
 
   virtual intptr_t ArgumentCount() const { return 2; }
 
-  intptr_t cid() const { return cid_; }
+  intptr_t deopt_id() const { return deopt_id_; }
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
 
   virtual LocationSummary* MakeLocationSummary() const;
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler);
 
   virtual bool CanDeoptimize() const { return false; }
 
  private:
-  const intptr_t cid_;  // Computation/instruction id.
+  const intptr_t deopt_id_;
   const intptr_t token_pos_;
   const intptr_t try_index_;
 
   DISALLOW_COPY_AND_ASSIGN(ReThrowInstr);
 };
 
 
 class GotoInstr : public InstructionWithInputs {
  public:
   explicit GotoInstr(JoinEntryInstr* entry)
@@ skipping 41 matching lines @@
 
 
 class BranchInstr : public InstructionWithInputs {
  public:
   BranchInstr(intptr_t token_pos,
               intptr_t try_index,
               Value* left,
               Value* right,
               Token::Kind kind)
       : InstructionWithInputs(),
-        cid_(Computation::kNoCid),
+        deopt_id_(Isolate::kNoDeoptId),
         ic_data_(NULL),
         token_pos_(token_pos),
         try_index_(try_index),
         left_(left),
         right_(right),
         kind_(kind),
         true_successor_(NULL),
         false_successor_(NULL) {
     ASSERT(left_ != NULL);
     ASSERT(right_ != NULL);
     ASSERT(Token::IsEqualityOperator(kind) ||
            Token::IsRelationalOperator(kind) ||
            Token::IsTypeTestOperator(kind));
     Isolate* isolate = Isolate::Current();
-    cid_ = isolate->GetNextCid();
-    ic_data_ = isolate->GetICDataForCid(cid_);
+    deopt_id_ = isolate->GetNextDeoptId();
+    ic_data_ = isolate->GetICDataForDeoptId(deopt_id_);
   }
 
   DECLARE_INSTRUCTION(Branch)
 
   virtual intptr_t ArgumentCount() const { return 0; }
 
   Value* left() const { return left_; }
   Value* right() const { return right_; }
   Token::Kind kind() const { return kind_; }
   void set_kind(Token::Kind kind) {
     ASSERT(Token::IsEqualityOperator(kind) ||
            Token::IsRelationalOperator(kind) ||
            Token::IsTypeTestOperator(kind));
     kind_ = kind;
   }
 
-  intptr_t cid() const { return cid_; }
+  intptr_t deopt_id() const { return deopt_id_; }
 
   const ICData* ic_data() const { return ic_data_; }
   bool HasICData() const {
     return (ic_data() != NULL) && !ic_data()->IsNull();
   }
 
   intptr_t token_pos() const { return token_pos_;}
   intptr_t try_index() const { return try_index_; }
 
   TargetEntryInstr* true_successor() const { return true_successor_; }
@@ skipping 17 matching lines @@
   virtual LocationSummary* MakeLocationSummary() const;
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler);
 
   void EmitBranchOnCondition(FlowGraphCompiler* compiler,
                              Condition true_condition);
 
   virtual bool CanDeoptimize() const { return true; }
 
  private:
-  intptr_t cid_;  // Computation/instruction id.
+  intptr_t deopt_id_;
   ICData* ic_data_;
   const intptr_t token_pos_;
   const intptr_t try_index_;
   Value* left_;
   Value* right_;
   Token::Kind kind_;
   TargetEntryInstr* true_successor_;
   TargetEntryInstr* false_successor_;
 
   DISALLOW_COPY_AND_ASSIGN(BranchInstr);
@@ skipping 83 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_