diff options
| author | 2015-04-20 17:11:32 +0000 | |
|---|---|---|
| committer | 2015-04-20 17:11:33 +0000 | |
| commit | 6149f962cd0815c61c134a7554036ca88d0abef1 (patch) | |
| tree | d41a91d6d43caaf6efd117ad482c7d558790471f /compiler | |
| parent | 9fab1eea3b9dc7a284dd74487ac603d9ffbb79fb (diff) | |
| parent | 8693fe1eda2e37ad162d792e9e793827bfa1c236 (diff) | |
Merge "RecordPcInfo() in GenerateStaticOrDirectCall() is misplaced on x86."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/code_generator_x86.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index 96a77bd7c6..87c74fb0cd 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -1220,6 +1220,7 @@ void InstructionCodeGeneratorX86::VisitInvokeStaticOrDirect(HInvokeStaticOrDirec codegen_->GenerateStaticOrDirectCall( invoke, invoke->GetLocations()->GetTemp(0).AsRegister<Register>()); + codegen_->RecordPcInfo(invoke, invoke->GetDexPc()); } void LocationsBuilderX86::VisitInvokeVirtual(HInvokeVirtual* invoke) { @@ -3106,7 +3107,6 @@ void CodeGeneratorX86::GenerateStaticOrDirectCall(HInvokeStaticOrDirect* invoke, } DCHECK(!IsLeafMethod()); - RecordPcInfo(invoke, invoke->GetDexPc()); } void CodeGeneratorX86::MarkGCCard(Register temp, Register card, Register object, Register value) { |