Simplify timeline backend

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/globals.h"
 #include "vm/handles.h"
 #include "vm/os_thread.h"
@@ skipping 254 matching lines @@
     state_.no_safepoint_scope_depth -= 1;
 #endif
   }
 
   // Collection of isolate-specific state of a thread that is saved/restored
   // on isolate exit/re-entry.
   struct State {
     Zone* zone;
     uword top_exit_frame_info;
     StackResource* top_resource;
-    TimelineEventBlock* timeline_block;
     LongJumpScope* long_jump_base;
 #if defined(DEBUG)
     HandleScope* top_handle_scope;
     intptr_t no_handle_scope_depth;
     int32_t no_safepoint_scope_depth;
 #endif
   };
 
 #define DEFINE_OFFSET_METHOD(type_name, member_name, expr, default_init_value) \
   static intptr_t member_name##offset() {                                      \
@@ skipping 19 matching lines @@
   static bool CanLoadFromThread(const Object& object);
   static intptr_t OffsetFromThread(const Object& object);
   static intptr_t OffsetFromThread(const RuntimeEntry* runtime_entry);
 
   Mutex* timeline_block_lock() {
     return &timeline_block_lock_;
   }
 
   // Only safe to access when holding |timeline_block_lock_|.
   TimelineEventBlock* timeline_block() const {
-    return state_.timeline_block;
+    return timeline_block_;
   }
 
   // Only safe to access when holding |timeline_block_lock_|.
   void set_timeline_block(TimelineEventBlock* block) {
-    state_.timeline_block = block;
+    timeline_block_ = block;
   }
 
   class Log* log() const;
 
   static const intptr_t kNoDeoptId = -1;
   static const intptr_t kDeoptIdStep = 2;
   static const intptr_t kDeoptIdBeforeOffset = 0;
   static const intptr_t kDeoptIdAfterOffset = 1;
   intptr_t deopt_id() const { return deopt_id_; }
   void set_deopt_id(int value) {
@@ skipping 81 matching lines @@
 
   static ThreadLocalKey thread_key_;
 
   const ThreadId id_;
   ThreadInterruptCallback thread_interrupt_callback_;
   void* thread_interrupt_data_;
   Isolate* isolate_;
   Heap* heap_;
   State state_;
   Mutex timeline_block_lock_;
+  TimelineEventBlock* timeline_block_;
   StoreBufferBlock* store_buffer_block_;
   class Log* log_;
   intptr_t deopt_id_;  // Compilation specific counter.
   uword vm_tag_;
 #define DECLARE_MEMBERS(type_name, member_name, expr, default_init_value)      \
   type_name member_name;
 CACHED_CONSTANTS_LIST(DECLARE_MEMBERS)
 #undef DECLARE_MEMBERS
 
 #define DECLARE_MEMBERS(name)      \
@@ skipping 92 matching lines @@
 };
 
 #if defined(TARGET_OS_WINDOWS)
 // Clears the state of the current thread and frees the allocation.
 void WindowsThreadCleanUp();
 #endif
 
 }  // namespace dart
 
 #endif  // VM_THREAD_H_