diff options
| author | 2016-10-20 14:41:18 +0000 | |
|---|---|---|
| committer | 2016-10-20 14:41:18 +0000 | |
| commit | 024662a3102df92fabf4f40d9ec40976f8e20c5d (patch) | |
| tree | 248a072ebfa8e3a7897ad08f819456f28e47c0bc /runtime/asm_support.h | |
| parent | 4a4ff643b629b268787fb97648116e1ac391f53b (diff) | |
| parent | af1e2990cd1406a0fb7cba1d2e208208e950e413 (diff) | |
Merge changes I16f8b7ec,I075bbf55
* changes:
jni: Support @FastNative methods that return objects
Revert "jni: Disable FastNative path for methods returning objects"
Diffstat (limited to 'runtime/asm_support.h')
| -rw-r--r-- | runtime/asm_support.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 567791e291..cd8815b25a 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -98,7 +98,7 @@ ADD_TEST_EQ(THREAD_LOCAL_POS_OFFSET, ADD_TEST_EQ(THREAD_LOCAL_END_OFFSET, art::Thread::ThreadLocalEndOffset<POINTER_SIZE>().Int32Value()) // Offset of field Thread::tlsPtr_.thread_local_objects. -#define THREAD_LOCAL_OBJECTS_OFFSET (THREAD_LOCAL_END_OFFSET + __SIZEOF_POINTER__) +#define THREAD_LOCAL_OBJECTS_OFFSET (THREAD_LOCAL_END_OFFSET + 2 * __SIZEOF_POINTER__) ADD_TEST_EQ(THREAD_LOCAL_OBJECTS_OFFSET, art::Thread::ThreadLocalObjectsOffset<POINTER_SIZE>().Int32Value()) // Offset of field Thread::tlsPtr_.mterp_current_ibase. |