Temporarily move vm_tag_ from BaseIsolate to Isolate.

runtime/vm/isolate.h

 // Copyright (c) 2013, 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/base_isolate.h"
@@ skipping 181 matching lines @@
   static intptr_t object_store_offset() {
     return OFFSET_OF(Isolate, object_store_);
   }
 
   uword top_exit_frame_info() const { return top_exit_frame_info_; }
   void set_top_exit_frame_info(uword value) { top_exit_frame_info_ = value; }
   static intptr_t top_exit_frame_info_offset() {
     return OFFSET_OF(Isolate, top_exit_frame_info_);
   }
 
+  uword vm_tag() const {
+    return vm_tag_;
+  }
+  void set_vm_tag(uword tag) {
+    vm_tag_ = tag;
+  }
   static intptr_t vm_tag_offset() {
     return OFFSET_OF(Isolate, vm_tag_);
   }
 
   ApiState* api_state() const { return api_state_; }
   void set_api_state(ApiState* value) { api_state_ = value; }
 
   StubCode* stub_code() const { return stub_code_; }
   void set_stub_code(StubCode* value) { stub_code_ = value; }
 
   LongJumpScope* long_jump_base() const { return long_jump_base_; }
   void set_long_jump_base(LongJumpScope* value) { long_jump_base_ = value; }
 
   TimerList& timer_list() { return timer_list_; }
 
-  static intptr_t current_zone_offset() {
-    return OFFSET_OF(Isolate, current_zone_);
-  }
-
   void set_init_callback_data(void* value) {
     init_callback_data_ = value;
   }
   void* init_callback_data() const {
     return init_callback_data_;
   }
 
   Dart_EnvironmentCallback environment_callback() const {
     return environment_callback_;
   }
@@ skipping 394 matching lines @@
 
   void set_user_tag(uword tag) {
     user_tag_ = tag;
   }
 
 
   template<class T> T* AllocateReusableHandle();
 
   static ThreadLocalKey isolate_key;
 
+  uword vm_tag_;
   StoreBuffer store_buffer_;
   ClassTable class_table_;
   MegamorphicCacheTable megamorphic_cache_table_;
   Dart_MessageNotifyCallback message_notify_callback_;
   char* name_;
   int64_t start_time_;
   Dart_Port main_port_;
   Dart_Port origin_id_;  // Isolates created by spawnFunc have some origin id.
   uint64_t pause_capability_;
   uint64_t terminate_capability_;
@@ skipping 215 matching lines @@
   uint8_t* serialized_args_;
   intptr_t serialized_args_len_;
   uint8_t* serialized_message_;
   intptr_t serialized_message_len_;
   bool paused_;
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_