commit df9a78201872d72adde40355a7020610b795def9
author Ian Rogers <irogers@google.com> Tue Oct 11 16:53:22 2011 -0700
committer Ian Rogers <irogers@google.com> Tue Oct 11 16:53:22 2011 -0700
tree e73ece501cf9e67739938ac5ff7b5ebe73058413
parent ea2a11d5f20814f17985ae3d4defc8dd843f19b9

Comment and minor clean up.

Change-Id: I06b37258c5fa49a351545528f7a524ccfcb77d94

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index e844421..4230cd3 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -323,8 +323,9 @@
   size_t args_in_regs = shorty_len < 3 ? shorty_len : 3;
   bool is_static;
   if (type == Runtime::kUnknownMethod) {
-    uint32_t dex_pc = (*caller_sp)->ToDexPC(caller_pc - 2);
     Method* caller = *caller_sp;
+    // less two as return address may span into next dex instruction
+    uint32_t dex_pc = caller->ToDexPC(caller_pc - 2);
     const DexFile& dex_file = Runtime::Current()->GetClassLinker()
                                   ->FindDexFile(caller->GetDeclaringClass()->GetDexCache());
     const DexFile::CodeItem* code = dex_file.GetCodeItem(caller->GetCodeItemOffset());