From 8693fe1eda2e37ad162d792e9e793827bfa1c236 Mon Sep 17 00:00:00 2001 From: Mingyao Yang Date: Fri, 17 Apr 2015 16:51:08 -0700 Subject: RecordPcInfo() in GenerateStaticOrDirectCall() is misplaced on x86. GenerateStaticOrDirectCall() is invoked in intrinsics_x86.cc and RecordPcInfo() is already taken care of there. It should be moved to VisitInvokeStaticOrDirect() as done in other archs. Change-Id: Id08d84c9046e55dea9d8a8452c979294c4183150 --- compiler/optimizing/code_generator_x86.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing') diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index 879216d59b..726fb0dccd 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -1212,6 +1212,7 @@ void InstructionCodeGeneratorX86::VisitInvokeStaticOrDirect(HInvokeStaticOrDirec codegen_->GenerateStaticOrDirectCall( invoke, invoke->GetLocations()->GetTemp(0).AsRegister()); + codegen_->RecordPcInfo(invoke, invoke->GetDexPc()); } void LocationsBuilderX86::VisitInvokeVirtual(HInvokeVirtual* invoke) { @@ -3098,7 +3099,6 @@ void CodeGeneratorX86::GenerateStaticOrDirectCall(HInvokeStaticOrDirect* invoke, } DCHECK(!IsLeafMethod()); - RecordPcInfo(invoke, invoke->GetDexPc()); } void CodeGeneratorX86::MarkGCCard(Register temp, Register card, Register object, Register value) { -- cgit v1.2.3-59-g8ed1b