diff options
| author | Andreas Gampe <agampe@google.com> | 2016-07-26 09:02:02 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2016-08-01 18:54:48 -0700 |
| commit | 542451cc546779f5c67840e105c51205a1b0a8fd (patch) | |
| tree | 11e09bb5abaee12dddffefbe7e425291076dfa7a /runtime/quick_exception_handler.cc | |
| parent | 85c4a4b8c9eabfe16e4e49f9b4aa78c1bf4be023 (diff) | |
ART: Convert pointer size to enum
Move away from size_t to dedicated enum (class).
Bug: 30373134
Bug: 30419309
Test: m test-art-host
Change-Id: Id453c330f1065012e7d4f9fc24ac477cc9bb9269
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index e9dd7aa073..46d9e7fcda 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -18,6 +18,7 @@ #include "arch/context.h" #include "art_method-inl.h" +#include "base/enums.h" #include "dex_instruction.h" #include "entrypoints/entrypoint_utils.h" #include "entrypoints/quick/quick_entrypoints_enum.h" @@ -509,11 +510,7 @@ void QuickExceptionHandler::PrepareForLongJumpToInvokeStubOrInterpreterBridge() } else { // PC needs to be of the quick-to-interpreter bridge. int32_t offset; - #ifdef __LP64__ - offset = GetThreadOffset<8>(kQuickQuickToInterpreterBridge).Int32Value(); - #else - offset = GetThreadOffset<4>(kQuickQuickToInterpreterBridge).Int32Value(); - #endif + offset = GetThreadOffset<kRuntimePointerSize>(kQuickQuickToInterpreterBridge).Int32Value(); handler_quick_frame_pc_ = *reinterpret_cast<uintptr_t*>( reinterpret_cast<uint8_t*>(self_) + offset); } |