Get rid of ast node ids.

runtime/vm/code_descriptors.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_CODE_DESCRIPTORS_H_
 #define VM_CODE_DESCRIPTORS_H_
 
 #include "vm/globals.h"
 #include "vm/growable_array.h"
 #include "vm/object.h"
 
 namespace dart {
 
 class DescriptorList : public ZoneAllocated {
  public:
   struct PcDesc {
     intptr_t pc_offset;        // PC offset value of the descriptor.
     PcDescriptors::Kind kind;  // Descriptor kind (kDeopt, kOther).
-    intptr_t node_id;          // AST node id.
+    intptr_t deopt_id;         // Deoptimization id.
     intptr_t token_index;      // Token position in source of PC.
     intptr_t try_index;        // Try block index of PC or deopt array index.
   };
 
   explicit DescriptorList(intptr_t initial_capacity) : list_(initial_capacity) {
   }
   ~DescriptorList() { }
 
   intptr_t Length() const {
     return list_.length();
   }
 
   intptr_t PcOffset(int index) const {
     return list_[index].pc_offset;
   }
   PcDescriptors::Kind Kind(int index) const {
     return list_[index].kind;
   }
-  intptr_t NodeId(int index) const {
-    return list_[index].node_id;
+  intptr_t DeoptId(int index) const {
+    return list_[index].deopt_id;
   }
-  intptr_t TokenIndex(int index) const {
+  intptr_t TokenPos(int index) const {
     return list_[index].token_index;
   }
   intptr_t TryIndex(int index) const {
     return list_[index].try_index;
   }
 
   void AddDescriptor(PcDescriptors::Kind kind,
                      intptr_t pc_offset,
-                     intptr_t node_id,
+                     intptr_t deopt_id,
                      intptr_t token_index,
                      intptr_t try_index);
   void AddDeoptInfo(intptr_t pc_offset,
-                    intptr_t node_id,
+                    intptr_t deopt_id,
                     intptr_t token_index,
                     intptr_t deopt_array_index);
 
   RawPcDescriptors* FinalizePcDescriptors(uword entry_point);
 
  private:
   GrowableArray<struct PcDesc> list_;
   DISALLOW_COPY_AND_ASSIGN(DescriptorList);
 };
 
@@ skipping 63 matching lines @@
   }
 
  private:
   GrowableArray<struct HandlerDesc> list_;
   DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerList);
 };
 
 }  // namespace dart
 
 #endif  // VM_CODE_DESCRIPTORS_H_