Move CHA field back to Isolate, pending a permanent fix.

runtime/vm/thread.h

 // Copyright (c) 2015, 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_THREAD_H_
 #define VM_THREAD_H_
 
 #include "vm/base_isolate.h"
 #include "vm/globals.h"
 #include "vm/os_thread.h"
@@ skipping 28 matching lines @@
   static void InitOnce();
 
   // The topmost zone used for allocation in this thread.
   Zone* zone() {
     return reinterpret_cast<BaseIsolate*>(isolate())->current_zone();
   }
 
   // The isolate that this thread is operating on, or NULL if none.
   Isolate* isolate() const { return isolate_; }
 
-  // The (topmost) CHA for the compilation in this thread.
-  CHA* cha() const { return cha_; }
-  void set_cha(CHA* value) { cha_ = value; }
+  // The (topmost) CHA for the compilation in the isolate of this thread.
+  // TODO(23153): Move this out of Isolate/Thread.
+  CHA* cha() const;
+  void set_cha(CHA* value);
 
  private:
   static ThreadLocalKey thread_key_;
 
   Isolate* isolate_;
-  CHA* cha_;
 
   Thread()
-      : isolate_(NULL),
-        cha_(NULL) {}
+      : isolate_(NULL) {}
 
   static void SetCurrent(Thread* current);
 
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 }  // namespace dart
 
 #endif  // VM_THREAD_H_