Get rid of ast node ids.

runtime/vm/code_descriptors.cc

 // 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.
 
 #include "vm/code_descriptors.h"
 
 namespace dart {
 
 void DescriptorList::AddDescriptor(PcDescriptors::Kind kind,
                                    intptr_t pc_offset,
-                                   intptr_t node_id,
+                                   intptr_t deopt_id,
                                    intptr_t token_index,
                                    intptr_t try_index) {
   struct PcDesc data;
   data.pc_offset = pc_offset;
   data.kind = kind;
-  data.node_id = node_id;
+  data.deopt_id = deopt_id;
   data.token_index = token_index;
   data.try_index = try_index;
   list_.Add(data);
 }
 
 
 void DescriptorList::AddDeoptInfo(intptr_t pc_offset,
-                                  intptr_t node_id,
+                                  intptr_t deopt_id,
                                   intptr_t token_index,
                                   intptr_t deopt_array_index) {
   struct PcDesc data;
   data.pc_offset = pc_offset;
   data.kind = PcDescriptors::kDeoptIndex;
-  data.node_id = node_id;
+  data.deopt_id = deopt_id;
   data.token_index = token_index;
   // Try_index is reused for deopt_array_index.
   data.try_index = deopt_array_index;
   list_.Add(data);
 }
 
 
 RawPcDescriptors* DescriptorList::FinalizePcDescriptors(uword entry_point) {
   intptr_t num_descriptors = Length();
   const PcDescriptors& descriptors =
       PcDescriptors::Handle(PcDescriptors::New(num_descriptors));
   for (intptr_t i = 0; i < num_descriptors; i++) {
     descriptors.AddDescriptor(i,
                               (entry_point + PcOffset(i)),
                               Kind(i),
-                              NodeId(i),
-                              TokenIndex(i),
+                              DeoptId(i),
+                              TokenPos(i),
                               TryIndex(i));
   }
   return descriptors.raw();
 }
 
 
 void StackmapTableBuilder::AddEntry(intptr_t pc_offset,
                                     BitmapBuilder* bitmap) {
   stack_map_ = Stackmap::New(pc_offset, bitmap);
   list_.Add(stack_map_);
@@ skipping 32 matching lines @@
 }
 
 
 RawStackmap* StackmapTableBuilder::Map(int index) const {
   Stackmap& map = Stackmap::Handle();
   map ^= list_.At(index);
   return map.raw();
 }
 
 }  // namespace dart