commit 7c0fe5e99d1d150b3072a3ae4cd0f0362fe32834
author Mathieu Chartier <mathieuc@google.com> Fri Jul 17 19:53:47 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Sun Jul 19 14:13:00 2015 -0700
tree e881b8572b90bab7d4ea416af7920a6bdcc7ba71
parent b2295afd038c921ac4219c3d09774579bd577c87

Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo

Bug: 22541058

Change-Id: Id084a69ccd9835147ec71df6bb759e0f1b5e6fbf

runtime/art_method-inl.h

diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h
index 8712bdb..bb3c72c 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"
@@ -317,7 +318,9 @@
 
 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_;
 }