commit 0a299b9305d42074a47a7922aff855c840a76cfd
author Nicolas Geoffray <ngeoffray@google.com> Thu Jan 29 11:39:44 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Jan 29 11:39:44 2015 +0000
tree 3e31c006b7906447a3e5576f9d15b588b4c5a97d
parent c9ff6b112d25657128f9a7251e253b1382b0f1b9

Fix bad rebase.

Change-Id: Ia66c5ec4a612908b749b058d85f374d1f1b72a2a

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 0909424..defeaff 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -1847,9 +1847,9 @@
   //
   // Currently we implement the app -> app logic, which looks up in the resolve cache.
 
+  // temp = method;
+  LoadCurrentMethod(temp);
   if (!invoke->IsRecursive()) {
-    // temp = method;
-    LoadCurrentMethod(temp);
     // temp = temp->dex_cache_resolved_methods_;
     __ Ldr(temp, HeapOperand(temp, mirror::ArtMethod::DexCacheResolvedMethodsOffset()));
     // temp = temp[index_in_cache];