Get rid of ast node ids.

runtime/vm/isolate.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/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "lib/mirrors.h"
 #include "vm/compiler_stats.h"
@@ skipping 139 matching lines @@
       top_context_(Context::null()),
       random_seed_(Random::kDefaultRandomSeed),
       top_exit_frame_info_(0),
       init_callback_data_(NULL),
       library_tag_handler_(NULL),
       api_state_(NULL),
       stub_code_(NULL),
       debugger_(NULL),
       long_jump_base_(NULL),
       timer_list_(),
-      ast_node_id_(AstNode::kNoId),
-      computation_id_(AstNode::kNoId),
+      deopt_id_(0),
       ic_data_array_(Array::null()),
       mutex_(new Mutex()),
       stack_limit_(0),
       saved_stack_limit_(0),
       message_handler_(NULL),
       spawn_data_(NULL),
       gc_prologue_callbacks_(),
       gc_epilogue_callbacks_(),
       deopt_registers_copy_(NULL),
       deopt_frame_copy_(NULL),
@@ skipping 126 matching lines @@
   MutexLocker ml(mutex_);
   if (stack_limit_ == saved_stack_limit_) {
     return 0;  // No interrupt was requested.
   }
   uword interrupt_bits = stack_limit_ & kInterruptsMask;
   stack_limit_ = saved_stack_limit_;
   return interrupt_bits;
 }
 
 
-ICData* Isolate::GetICDataForCid(intptr_t cid) const {
+ICData* Isolate::GetICDataForDeoptId(intptr_t deopt_id) const {
   if (ic_data_array() == Array::null()) {
     return NULL;
   }
   const Array& array_handle = Array::Handle(ic_data_array());
-  if (cid >= array_handle.Length()) {
+  if (deopt_id >= array_handle.Length()) {
     // For computations being added in the optimizing compiler.
     return NULL;
   }
   ICData& ic_data_handle = ICData::ZoneHandle();
-  ic_data_handle ^= array_handle.At(cid);
+  ic_data_handle ^= array_handle.At(deopt_id);
   return &ic_data_handle;
 }
 
 
 static int MostUsedFunctionFirst(const Function* const* a,
                                  const Function* const* b) {
   if ((*a)->usage_counter() > (*b)->usage_counter()) {
     return -1;
   } else if ((*a)->usage_counter() < (*b)->usage_counter()) {
     return 1;
@@ skipping 140 matching lines @@
 
 
 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor,
                                          bool visit_prologue_weak_handles) {
   if (api_state() != NULL) {
     api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles);
   }
 }
 
 }  // namespace dart