commit ae7cbf45460b472dbd159ab565d55b2880703abb
author buzbee <buzbee@google.com> Wed Sep 21 18:40:28 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 21 18:40:28 2011 -0700
tree 06df332a557297d987395fa341a951375b84a1aa
parent 33203b59aa5f27bac0433bdb640f1f1e911186eb
parent 010cffc1b8d64a4afc1943729642477a16e9c3fb

Merge "Restore Method* following invoke with > 20 args" into dalvik-dev

src/compiler/codegen/arm/MethodCodegenDriver.cc

diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc
index 8dc388c..ce65803 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -849,6 +849,8 @@
         loadWordDisp(cUnit, rSELF, OFFSETOF_MEMBER(Thread, pMemcpy), rLR);
         loadConstant(cUnit, r2, (numArgs - 3) * 4);
         callNoUnwindHelper(cUnit, rLR);
+        // Restore Method*
+        loadCurrMethodDirect(cUnit, r0);
     } else {
         // Use vldm/vstm pair using r3 as a temp
         int regsLeft = std::min(numArgs - 3, 16);