Index: runtime/vm/thread.h |
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h |
index 2d8531cb0c5afe22b777895f93c4829a2b076528..0f64d626ca0c08325c9183d5410cdf90bc897cf3 100644 |
--- a/runtime/vm/thread.h |
+++ b/runtime/vm/thread.h |
@@ -69,11 +69,10 @@ class Zone; |
V(TypeParameter) \ |
-// 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) \ |
+#if defined(TARGET_ARCH_DBC) |
+#define CACHED_VM_STUBS_LIST(V) |
+#else |
+#define CACHED_VM_STUBS_LIST(V) \ |
V(RawCode*, update_store_buffer_code_, \ |
StubCode::UpdateStoreBuffer_entry()->code(), NULL) \ |
V(RawCode*, fix_callers_target_code_, \ |
@@ -83,9 +82,26 @@ class Zone; |
V(RawCode*, invoke_dart_code_stub_, \ |
StubCode::InvokeDartCode_entry()->code(), NULL) \ |
-#define CACHED_ADDRESSES_LIST(V) \ |
+#endif |
+ |
+// 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) \ |
+ CACHED_VM_STUBS_LIST(V) \ |
+ |
+#if defined(TARGET_ARCH_DBC) |
+#define CACHED_VM_STUBS_ADDRESSES_LIST(V) |
+#else |
+#define CACHED_VM_STUBS_ADDRESSES_LIST(V) \ |
V(uword, update_store_buffer_entry_point_, \ |
StubCode::UpdateStoreBuffer_entry()->EntryPoint(), 0) \ |
+ |
+#endif |
+ |
+#define CACHED_ADDRESSES_LIST(V) \ |
+ CACHED_VM_STUBS_ADDRESSES_LIST(V) \ |
V(uword, native_call_wrapper_entry_point_, \ |
NativeEntry::NativeCallWrapperEntry(), 0) \ |
V(RawString**, predefined_symbols_address_, \ |