commit c345f141f11faad177aa9635a78088d00cf66086
author Nicolas Geoffray <ngeoffray@google.com> Thu Jun 04 17:17:32 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Jun 04 17:17:32 2015 +0000
tree 0a9fbb0f1f90dfe273d94659f077cc1e6b84966c
parent 38207af82afb6f99c687f64b15601ed20d82220a

Revert "Use HCurrentMethod in HInvokeStaticOrDirect."

Fails on baseline/x86.

This reverts commit 38207af82afb6f99c687f64b15601ed20d82220a.

Change-Id: Ib71018367eb7c6046965494a7e996c22af3de403

compiler/optimizing/code_generator.cc

diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc
index 049b3e3..08c0351 100644
--- a/compiler/optimizing/code_generator.cc
+++ b/compiler/optimizing/code_generator.cc
@@ -292,6 +292,7 @@
     HInvoke* invoke, InvokeDexCallingConventionVisitor* visitor) {
   ArenaAllocator* allocator = invoke->GetBlock()->GetGraph()->GetArena();
   LocationSummary* locations = new (allocator) LocationSummary(invoke, LocationSummary::kCall);
+  locations->AddTemp(visitor->GetMethodLocation());
 
   for (size_t i = 0; i < invoke->GetNumberOfArguments(); i++) {
     HInstruction* input = invoke->InputAt(i);
@@ -299,20 +300,6 @@
   }
 
   locations->SetOut(visitor->GetReturnLocation(invoke->GetType()));
-
-  if (invoke->IsInvokeStaticOrDirect()) {
-    HInvokeStaticOrDirect* call = invoke->AsInvokeStaticOrDirect();
-    if (call->IsStringInit()) {
-      locations->AddTemp(visitor->GetMethodLocation());
-    } else if (call->IsRecursive()) {
-      locations->SetInAt(call->GetCurrentMethodInputIndex(), visitor->GetMethodLocation());
-    } else {
-      locations->AddTemp(visitor->GetMethodLocation());
-      locations->SetInAt(call->GetCurrentMethodInputIndex(), Location::RequiresRegister());
-    }
-  } else {
-    locations->AddTemp(visitor->GetMethodLocation());
-  }
 }
 
 void CodeGenerator::BlockIfInRegister(Location location, bool is_out) const {