Move CHA state keeping from Isolate to Thread.

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 136 matching lines @@
   StoreBuffer* store_buffer() { return &store_buffer_; }
   static intptr_t store_buffer_offset() {
     return OFFSET_OF(Isolate, store_buffer_);
   }
 
   ClassTable* class_table() { return &class_table_; }
   static intptr_t class_table_offset() {
     return OFFSET_OF(Isolate, class_table_);
   }
 
-  CHA* cha() const { return cha_; }
-  void set_cha(CHA* value) { cha_ = value; }
-
   MegamorphicCacheTable* megamorphic_cache_table() {
     return &megamorphic_cache_table_;
   }
 
   Dart_MessageNotifyCallback message_notify_callback() const {
     return message_notify_callback_;
   }
   void set_message_notify_callback(Dart_MessageNotifyCallback value) {
     message_notify_callback_ = value;
   }
@@ skipping 484 matching lines @@
 
   void BuildName(const char* name_prefix);
   void PrintInvokedFunctions();
 
   void ProfileIdle();
 
   void set_user_tag(uword tag) {
     user_tag_ = tag;
   }
 
+  CHA* cha() const { return cha_; }
+  void set_cha(CHA* value) { cha_ = value; }
 
   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_;
@@ skipping 111 matching lines @@
   static void CheckForDuplicateThreadState(InterruptableThreadState* state);
   static Monitor* isolates_list_monitor_;
   static Isolate* isolates_list_head_;
 
 #define REUSABLE_FRIEND_DECLARATION(name)                                      \
   friend class Reusable##name##HandleScope;
 REUSABLE_HANDLE_LIST(REUSABLE_FRIEND_DECLARATION)
 #undef REUSABLE_FRIEND_DECLARATION
 
   friend class ServiceIsolate;
+  friend class Thread;
 
   DISALLOW_COPY_AND_ASSIGN(Isolate);
 };
 
 
 // When we need to execute code in an isolate, we use the
 // StartIsolateScope.
 class StartIsolateScope {
  public:
   explicit StartIsolateScope(Isolate* new_isolate)
@@ skipping 107 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_