summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-01-29 11:39:44 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2015-01-29 11:39:44 +0000
commit0a299b9305d42074a47a7922aff855c840a76cfd (patch)
tree3e31c006b7906447a3e5576f9d15b588b4c5a97d
parentc9ff6b112d25657128f9a7251e253b1382b0f1b9 (diff)
Fix bad rebase.
Change-Id: Ia66c5ec4a612908b749b058d85f374d1f1b72a2a
-rw-r--r--compiler/optimizing/code_generator_arm64.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 0909424c14..defeafff1e 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -1847,9 +1847,9 @@ void CodeGeneratorARM64::GenerateStaticOrDirectCall(HInvokeStaticOrDirect* invok
//
// 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];