diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-01-09 14:03:35 -0800 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2015-01-23 14:07:32 -0800 |
| commit | 2cd334ae2d4287216523882f0d298cf3901b7ab1 (patch) | |
| tree | b72d3d07e5a04151caca96cae345075b6e4452b0 /runtime/entrypoints_order_test.cc | |
| parent | 604e2828896fbb8663897d1e75112da7305ead4c (diff) | |
| download | android_art-2cd334ae2d4287216523882f0d298cf3901b7ab1.tar.gz android_art-2cd334ae2d4287216523882f0d298cf3901b7ab1.tar.bz2 android_art-2cd334ae2d4287216523882f0d298cf3901b7ab1.zip | |
More of the concurrent copying collector.
Bug: 12687968
Change-Id: I62f70274d47df6d6cab714df95c518b750ce3105
Diffstat (limited to 'runtime/entrypoints_order_test.cc')
| -rw-r--r-- | runtime/entrypoints_order_test.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index 13132632bb..daa24c93f3 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -130,8 +130,11 @@ class EntrypointsOrderTest : public CommonRuntimeTest { EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_alloc_stack_top, thread_local_alloc_stack_end, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_alloc_stack_end, held_mutexes, sizeof(void*)); - EXPECT_OFFSET_DIFF(Thread, tlsPtr_.held_mutexes, Thread, wait_mutex_, - sizeof(void*) * kLockLevelCount + sizeof(void*), thread_tlsptr_end); + EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, held_mutexes, nested_signal_state, + sizeof(void*) * kLockLevelCount); + EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, nested_signal_state, flip_function, sizeof(void*)); + EXPECT_OFFSET_DIFF(Thread, tlsPtr_.flip_function, Thread, wait_mutex_, sizeof(void*), + thread_tlsptr_end); } void CheckInterpreterEntryPoints() { |