commit 93868217589caa3302a3886f55b99447db78e093
author buzbee <buzbee@google.com> Wed Sep 14 23:37:00 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 14 23:37:00 2011 -0700
tree 5cfda8ef2ef49f5574da7dc245f2ba9648666d54
parent 7ede61eceed2f8da14a4fff05c57c748c160d57f
parent 367ce0b7b8241354ae484e7e041707464729b5cd

Merge "Fix invoke-interface bug." 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 7196efc..b8045e2 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -932,10 +932,10 @@
     if (mir->dalvikInsn.opcode == OP_INVOKE_INTERFACE)
         callState = genDalvikArgsNoRange(cUnit, mir, dInsn, callState, &nullCk,
                                          false, nextInterfaceCallInsn, NULL,
-                                         true);
+                                         false);
     else
         callState = genDalvikArgsRange(cUnit, mir, dInsn, callState, &nullCk,
-                                       nextInterfaceCallInsn, NULL, true);
+                                       nextInterfaceCallInsn, NULL, false);
     // Finish up any of the call sequence not interleaved in arg loading
     while (callState >= 0) {
         callState = nextInterfaceCallInsn(cUnit, mir, dInsn, callState, NULL);