Get rid of ast node ids.

runtime/vm/intermediate_language.h

Index: runtime/vm/intermediate_language.h
===================================================================
--- runtime/vm/intermediate_language.h	(revision 10265)
+++ runtime/vm/intermediate_language.h	(working copy)
@@ -118,16 +118,14 @@
 
 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; }
@@ -205,7 +203,7 @@
 #undef DECLARE_PREDICATE
 
  private:
-  intptr_t cid_;
+  intptr_t deopt_id_;
   ICData* ic_data_;
   LocationSummary* locs_;
 
@@ -2480,7 +2478,7 @@
  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);
@@ -2490,7 +2488,7 @@
 
   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_; }
 
@@ -2501,7 +2499,7 @@
   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_;
 
@@ -2513,7 +2511,7 @@
  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) { }
 
@@ -2521,7 +2519,7 @@
 
   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_; }
 
@@ -2532,7 +2530,7 @@
   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_;
 
@@ -2545,7 +2543,7 @@
   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) { }
 
@@ -2553,7 +2551,7 @@
 
   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_; }
 
@@ -2564,7 +2562,7 @@
   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_;
 
@@ -2626,7 +2624,7 @@
               Value* right,
               Token::Kind kind)
       : InstructionWithInputs(),
-        cid_(Computation::kNoCid),
+        deopt_id_(Isolate::kNoDeoptId),
         ic_data_(NULL),
         token_pos_(token_pos),
         try_index_(try_index),
@@ -2641,8 +2639,8 @@
            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)
@@ -2659,7 +2657,7 @@
     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 {
@@ -2697,7 +2695,7 @@
   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_;