commit be86eabe578df433f46055bae08e77314a661d49
author Mathieu Chartier <mathieuc@google.com> Tue Jul 21 20:34:45 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 21 20:34:46 2015 +0000
tree a7301ede320e08ac4d2dce75bac07f42c54d7bc6
parent 3387f39750942b0442eec351757c7d1f9b1405ca
parent bfbb72ed414688d070fab5c35d652def5ea6361d

Merge "Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo" into mnc-dev

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index f314f61..5274f9e 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -1048,6 +1048,7 @@
     if (m->IsRuntimeMethod()) {
       return true;
     }
+    m = m->GetInterfaceMethodIfProxy(sizeof(void*));
     const int kMaxRepetition = 3;
     mirror::Class* c = m->GetDeclaringClass();
     mirror::DexCache* dex_cache = c->GetDexCache();