diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-07-21 20:34:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-21 20:34:46 +0000 |
| commit | be86eabe578df433f46055bae08e77314a661d49 (patch) | |
| tree | a7301ede320e08ac4d2dce75bac07f42c54d7bc6 | |
| parent | 3387f39750942b0442eec351757c7d1f9b1405ca (diff) | |
| parent | bfbb72ed414688d070fab5c35d652def5ea6361d (diff) | |
| download | art-be86eabe578df433f46055bae08e77314a661d49.zip art-be86eabe578df433f46055bae08e77314a661d49.tar.gz art-be86eabe578df433f46055bae08e77314a661d49.tar.bz2 | |
Merge "Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo" into mnc-dev
| -rw-r--r-- | runtime/art_method-inl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h index 5cfce41..28a5e67 100644 --- a/runtime/art_method-inl.h +++ b/runtime/art_method-inl.h @@ -20,6 +20,7 @@ #include "art_method.h" #include "art_field.h" +#include "base/logging.h" #include "dex_file.h" #include "dex_file-inl.h" #include "gc_root-inl.h" @@ -314,7 +315,9 @@ inline uintptr_t ArtMethod::NativeQuickPcOffset(const uintptr_t pc) { inline QuickMethodFrameInfo ArtMethod::GetQuickFrameInfo(const void* code_pointer) { DCHECK(code_pointer != nullptr); - DCHECK_EQ(code_pointer, GetQuickOatCodePointer(sizeof(void*))); + if (kIsDebugBuild && !IsProxyMethod()) { + CHECK_EQ(code_pointer, GetQuickOatCodePointer(sizeof(void*))); + } return reinterpret_cast<const OatQuickMethodHeader*>(code_pointer)[-1].frame_info_; } |