diff options
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 987a6c4ff7..022948e0e7 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -681,7 +681,7 @@ Location InvokeDexCallingConventionVisitorARM::GetNextLocation(Primitive::Type t return Location(); } -Location InvokeDexCallingConventionVisitorARM::GetReturnLocation(Primitive::Type type) { +Location InvokeDexCallingConventionVisitorARM::GetReturnLocation(Primitive::Type type) const { switch (type) { case Primitive::kPrimBoolean: case Primitive::kPrimByte: @@ -710,6 +710,10 @@ Location InvokeDexCallingConventionVisitorARM::GetReturnLocation(Primitive::Type UNREACHABLE(); } +Location InvokeDexCallingConventionVisitorARM::GetMethodLocation() const { + return Location::RegisterLocation(kMethodRegisterArgument); +} + void CodeGeneratorARM::Move32(Location destination, Location source) { if (source.Equals(destination)) { return; @@ -1285,17 +1289,8 @@ void InstructionCodeGeneratorARM::VisitInvokeStaticOrDirect(HInvokeStaticOrDirec } void LocationsBuilderARM::HandleInvoke(HInvoke* invoke) { - LocationSummary* locations = - new (GetGraph()->GetArena()) LocationSummary(invoke, LocationSummary::kCall); - locations->AddTemp(Location::RegisterLocation(kMethodRegisterArgument)); - InvokeDexCallingConventionVisitorARM calling_convention_visitor; - for (size_t i = 0; i < invoke->GetNumberOfArguments(); i++) { - HInstruction* input = invoke->InputAt(i); - locations->SetInAt(i, calling_convention_visitor.GetNextLocation(input->GetType())); - } - - locations->SetOut(calling_convention_visitor.GetReturnLocation(invoke->GetType())); + CodeGenerator::CreateCommonInvokeLocationSummary(invoke, &calling_convention_visitor); } void LocationsBuilderARM::VisitInvokeVirtual(HInvokeVirtual* invoke) { |