Load runtime entries from the Thread instead of the ObjectPool.

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/os_thread.h"
 #include "vm/store_buffer.h"
+#include "vm/runtime_entry_list.h"
 
 namespace dart {
 
 class CHA;
 class HandleScope;
 class Heap;
 class Isolate;
 class LongJumpScope;
 class Object;
 class RawBool;
 class RawObject;
+class RuntimeEntry;
 class StackResource;
 class TimelineEventBlock;
 class Zone;
 
-
 // List of VM-global objects/addresses cached in each Thread object.
 #define CACHED_VM_OBJECTS_LIST(V)                                              \
   V(RawObject*, object_null_, Object::null(), NULL)                            \
   V(RawBool*, bool_true_, Object::bool_true().raw(), NULL)                     \
   V(RawBool*, bool_false_, Object::bool_false().raw(), NULL)                   \
 
 #define CACHED_ADDRESSES_LIST(V)                                               \
   V(uword, update_store_buffer_entry_point_,                                   \
-    StubCode::UpdateStoreBuffer_entry()->EntryPoint(), 0)
+    StubCode::UpdateStoreBuffer_entry()->EntryPoint(), 0)                      \
 
 #define CACHED_CONSTANTS_LIST(V)                                               \
   CACHED_VM_OBJECTS_LIST(V)                                                    \
-  CACHED_ADDRESSES_LIST(V)
+  CACHED_ADDRESSES_LIST(V)                                                     \
 
 struct InterruptedThreadState {
   ThreadId tid;
   uintptr_t pc;
   uintptr_t csp;
   uintptr_t dsp;
   uintptr_t fp;
   uintptr_t lr;
 };
 
@@ skipping 169 matching lines @@
 #endif
   };
 
 #define DEFINE_OFFSET_METHOD(type_name, member_name, expr, default_init_value) \
   static intptr_t member_name##offset() {                                      \
     return OFFSET_OF(Thread, member_name);                                     \
   }
 CACHED_CONSTANTS_LIST(DEFINE_OFFSET_METHOD)
 #undef DEFINE_OFFSET_METHOD
 
+#define DEFINE_OFFSET_METHOD(name)                                             \
+  static intptr_t name##_entry_point_offset() {                                \
+    return OFFSET_OF(Thread, name##_entry_point_);                             \
+  }
+RUNTIME_ENTRY_LIST(DEFINE_OFFSET_METHOD)
+#undef DEFINE_OFFSET_METHOD
+
+#define DEFINE_OFFSET_METHOD(returntype, name, ...)                            \
+  static intptr_t name##_entry_point_offset() {                                \
+    return OFFSET_OF(Thread, name##_entry_point_);                             \
+  }
+LEAF_RUNTIME_ENTRY_LIST(DEFINE_OFFSET_METHOD)
+#undef DEFINE_OFFSET_METHOD
+
   static bool CanLoadFromThread(const Object& object);
   static intptr_t OffsetFromThread(const Object& object);
+  static intptr_t OffsetFromThread(const RuntimeEntry* runtime_entry);
 
   TimelineEventBlock* timeline_block() const {
     return state_.timeline_block;
   }
 
   void set_timeline_block(TimelineEventBlock* block) {
     state_.timeline_block = block;
   }
 
   LongJumpScope* long_jump_base() const { return state_.long_jump_base; }
@@ skipping 19 matching lines @@
   void* thread_interrupt_data_;
   Isolate* isolate_;
   Heap* heap_;
   State state_;
   StoreBufferBlock* store_buffer_block_;
 #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)      \
+  uword name##_entry_point_;
+RUNTIME_ENTRY_LIST(DECLARE_MEMBERS)
+#undef DECLARE_MEMBERS
+
+#define DECLARE_MEMBERS(returntype, name, ...)      \
+  uword name##_entry_point_;
+LEAF_RUNTIME_ENTRY_LIST(DECLARE_MEMBERS)
+#undef DECLARE_MEMBERS
+
   explicit Thread(bool init_vm_constants = true);
 
   void InitVMConstants();
 
   void ClearState() {
     memset(&state_, 0, sizeof(state_));
   }
 
   void StoreBufferRelease(bool check_threshold = true);
   void StoreBufferAcquire();
@@ skipping 14 matching lines @@
   friend class ApiZone;
   friend class Isolate;
   friend class StackZone;
   friend class ThreadRegistry;
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 }  // namespace dart
 
 #endif  // VM_THREAD_H_