Get rid of ast node ids.

runtime/vm/isolate.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_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/class_table.h"
@@ skipping 156 matching lines @@
 
   void ScheduleInterrupts(uword interrupt_bits);
   uword GetAndClearInterrupts();
 
   MessageHandler* message_handler() const { return message_handler_; }
   void set_message_handler(MessageHandler* value) { message_handler_ = value; }
 
   uword spawn_data() const { return spawn_data_; }
   void set_spawn_data(uword value) { spawn_data_ = value; }
 
-  // Deprecate.
-  intptr_t ast_node_id() const { return ast_node_id_; }
-  void set_ast_node_id(int value) { ast_node_id_ = value; }
-
-  intptr_t computation_id() const { return computation_id_; }
-  void set_computation_id(int value) { computation_id_ = value; }
-  intptr_t GetNextCid() { return computation_id_++; }
+  static const intptr_t kNoDeoptId = -1;
+  intptr_t deopt_id() const { return deopt_id_; }
+  void set_deopt_id(int value) {
+    ASSERT(value >= 0);
+    deopt_id_ = value;
+  }
+  intptr_t GetNextDeoptId() {
+    ASSERT(deopt_id_ != kNoDeoptId);
+    return deopt_id_++;
+  }
 
   RawArray* ic_data_array() const { return ic_data_array_; }
   void set_ic_data_array(RawArray* value) { ic_data_array_ = value; }
-  ICData* GetICDataForCid(intptr_t cid) const;
+  ICData* GetICDataForDeoptId(intptr_t deopt_id) const;
 
   Debugger* debugger() const { return debugger_; }
 
   GcPrologueCallbacks& gc_prologue_callbacks() {
     return gc_prologue_callbacks_;
   }
 
   GcEpilogueCallbacks& gc_epilogue_callbacks() {
     return gc_epilogue_callbacks_;
   }
@@ skipping 53 matching lines @@
   RawContext* top_context_;
   int32_t random_seed_;
   uword top_exit_frame_info_;
   void* init_callback_data_;
   Dart_LibraryTagHandler library_tag_handler_;
   ApiState* api_state_;
   StubCode* stub_code_;
   Debugger* debugger_;
   LongJump* long_jump_base_;
   TimerList timer_list_;
-  intptr_t ast_node_id_;  // Deprecate.
-  intptr_t computation_id_;
+  intptr_t deopt_id_;
   RawArray* ic_data_array_;
   Mutex* mutex_;  // protects stack_limit_ and saved_stack_limit_.
   uword stack_limit_;
   uword saved_stack_limit_;
   MessageHandler* message_handler_;
   uword spawn_data_;
   GcPrologueCallbacks gc_prologue_callbacks_;
   GcEpilogueCallbacks gc_epilogue_callbacks_;
   // Deoptimization support.
   intptr_t* deopt_registers_copy_;
@@ skipping 67 matching lines @@
   Isolate* new_isolate_;
   Isolate* saved_isolate_;
   uword saved_stack_limit_;
 
   DISALLOW_COPY_AND_ASSIGN(SwitchIsolateScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_