diff options
| author | 2015-03-09 10:15:14 +0000 | |
|---|---|---|
| committer | 2015-03-09 10:15:14 +0000 | |
| commit | a60bb12ed88a0f11fb6a8444964ea55af2054824 (patch) | |
| tree | 8eabb49a208c04b219e5a1b037254647498d9d1d /runtime/entrypoints_order_test.cc | |
| parent | f20cc35c8e37a515fc19ca554b56ee78dfa7cc82 (diff) | |
| parent | 5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b (diff) | |
am 5c9d8f0d: Merge "Compute the right catch location for the debugger."
* commit '5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b':
Compute the right catch location for the debugger.
Diffstat (limited to 'runtime/entrypoints_order_test.cc')
| -rw-r--r-- | runtime/entrypoints_order_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index 9173357134..0fdfcb3afe 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -93,8 +93,7 @@ class EntrypointsOrderTest : public CommonRuntimeTest { EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, opeer, jpeer, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, jpeer, stack_begin, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, stack_begin, stack_size, sizeof(void*)); - EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, stack_size, throw_location, sizeof(void*)); - EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, throw_location, stack_trace_sample, sizeof(ThrowLocation)); + EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, stack_size, stack_trace_sample, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, stack_trace_sample, wait_next, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, wait_next, monitor_enter_object, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, monitor_enter_object, top_handle_scope, sizeof(void*)); |