summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-07-21 21:19:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-21 21:19:53 +0000
commit1e7fe0e605aa0aea40b9703fbd2cacb35197a4ee (patch)
treea7301ede320e08ac4d2dce75bac07f42c54d7bc6
parent49f64e853e17c31366bc18c06a3a6d9f7a23ca9b (diff)
parentbe86eabe578df433f46055bae08e77314a661d49 (diff)
downloadandroid_art-1e7fe0e605aa0aea40b9703fbd2cacb35197a4ee.tar.gz
android_art-1e7fe0e605aa0aea40b9703fbd2cacb35197a4ee.tar.bz2
android_art-1e7fe0e605aa0aea40b9703fbd2cacb35197a4ee.zip
am be86eabe: Merge "Don\'t check code pointer for proxies in ArtMethod::GetQuickFrameInfo" into mnc-dev
* commit 'be86eabe578df433f46055bae08e77314a661d49': Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo
-rw-r--r--runtime/art_method-inl.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h
index 5cfce41cc0..28a5e67224 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_;
}