diff options
author | 2019-10-07 07:15:53 +0000 | |
---|---|---|
committer | 2019-10-07 07:16:18 +0000 | |
commit | c34eab45161c51bf63e548e44645cbcc59d01268 (patch) | |
tree | 1b2a0eb85865d2cf6b1627cb5d64869e72412505 /runtime/entrypoints_order_test.cc | |
parent | 623d4f1ba4f4218c5472e3d9e1e9bf707795878d (diff) |
Revert "Revert^2 "Walk internal ArtField/ArtMethod pointers""
This reverts commit ea2a3d949354c8b054983ba629c81bc5ff7163da.
Bug: 134162467
Reason for revert: Fails redefine stress
Change-Id: If487c0bcacaf3a3f565ff475b6dad8321e3428b9
Diffstat (limited to 'runtime/entrypoints_order_test.cc')
-rw-r--r-- | runtime/entrypoints_order_test.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index 5235f65224..5b4275cbad 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -136,13 +136,10 @@ class EntrypointsOrderTest : public CommonRuntimeTest { EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, flip_function, method_verifier, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, method_verifier, thread_local_mark_stack, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_mark_stack, async_exception, sizeof(void*)); - EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, async_exception, top_reflective_handle_scope, - sizeof(void*)); // The first field after tlsPtr_ is forced to a 16 byte alignment so it might have some space. auto offset_tlsptr_end = OFFSETOF_MEMBER(Thread, tlsPtr_) + sizeof(decltype(reinterpret_cast<Thread*>(16)->tlsPtr_)); - CHECKED(offset_tlsptr_end - OFFSETOF_MEMBER(Thread, tlsPtr_.top_reflective_handle_scope) == - sizeof(void*), + CHECKED(offset_tlsptr_end - OFFSETOF_MEMBER(Thread, tlsPtr_.async_exception) == sizeof(void*), "async_exception last field"); } |