commit 415fd0833fe44b99ed57353f4bd7572681506daa
author Sebastien Hertz <shertz@google.com> Mon Jun 01 11:42:27 2015 +0200
committer Sebastien Hertz <shertz@google.com> Mon Jun 01 12:27:32 2015 +0200
tree 5c798549945457a86faf181495337722335ae4b0
parent a96bea54b7e3def5490d169f2bf92be2e68dd001

Fix JDWP tests after ArtMethod change

Fixes Throwable::GetStackDepth for exception event detection after
internal stack trace representation change.

Adds missing ArtMethod::GetInterfaceMethodIfProxy call in case of
proxy method.

Bug: 19264997
Change-Id: I363e293796848c3ec491c963813f62d868da44d2

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 7999559..24615e2 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -1467,7 +1467,7 @@
   if (m == nullptr) {
     return "null";
   }
-  return m->GetName();
+  return m->GetInterfaceMethodIfProxy(sizeof(void*))->GetName();
 }
 
 std::string Dbg::GetFieldName(JDWP::FieldId field_id) {
@@ -1590,8 +1590,9 @@
     ArtMethod* m = i < direct_method_count ?
         c->GetDirectMethod(i, ptr_size) : c->GetVirtualMethod(i - direct_method_count, ptr_size);
     expandBufAddMethodId(pReply, ToMethodId(m));
-    expandBufAddUtf8String(pReply, m->GetName());
-    expandBufAddUtf8String(pReply, m->GetSignature().ToString());
+    expandBufAddUtf8String(pReply, m->GetInterfaceMethodIfProxy(sizeof(void*))->GetName());
+    expandBufAddUtf8String(pReply,
+                           m->GetInterfaceMethodIfProxy(sizeof(void*))->GetSignature().ToString());
     if (with_generic) {
       const char* generic_signature = "";
       expandBufAddUtf8String(pReply, generic_signature);