commit 8693fe1eda2e37ad162d792e9e793827bfa1c236
author Mingyao Yang <mingyao@google.com> Fri Apr 17 16:51:08 2015 -0700
committer Mingyao Yang <mingyao@google.com> Fri Apr 17 17:09:12 2015 -0700
tree 25477a6397692e3c46eb75b8b6bee8b6c1c0cce9
parent 33259fdfcd350793d10f67f2ea7dfc6051a8afa2

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

diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 879216d..726fb0d 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -1212,6 +1212,7 @@
 
   codegen_->GenerateStaticOrDirectCall(
       invoke, invoke->GetLocations()->GetTemp(0).AsRegister<Register>());
+  codegen_->RecordPcInfo(invoke, invoke->GetDexPc());
 }
 
 void LocationsBuilderX86::VisitInvokeVirtual(HInvokeVirtual* invoke) {
@@ -3098,7 +3099,6 @@
   }
 
   DCHECK(!IsLeafMethod());
-  RecordPcInfo(invoke, invoke->GetDexPc());
 }
 
 void CodeGeneratorX86::MarkGCCard(Register temp, Register card, Register object, Register value) {