diff options
author | David Srbecky <dsrbecky@google.com> | 2016-02-24 10:23:50 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-24 10:23:50 +0000 |
commit | 0e02ee9efbf1dbdde05d2b10f7307bbe191c52f5 (patch) | |
tree | 19c9c3e25a8db4e5b53890fd72193383b5bb73e5 /compiler/optimizing/code_generator_arm.cc | |
parent | 72ca09cc2dd350adb932ef4a50eff668cca99c5e (diff) | |
parent | c7098ff991bb4e00a800d315d1c36f52a9cb0149 (diff) |
Merge "Remove HNativeDebugInfo from start of basic blocks."
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
-rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 87f52c6f21..f60c5e9d86 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -1557,11 +1557,11 @@ void LocationsBuilderARM::VisitNativeDebugInfo(HNativeDebugInfo* info) { } void InstructionCodeGeneratorARM::VisitNativeDebugInfo(HNativeDebugInfo* info) { - if (codegen_->HasStackMapAtCurrentPc()) { - // Ensure that we do not collide with the stack map of the previous instruction. - __ nop(); - } - codegen_->RecordPcInfo(info, info->GetDexPc()); + codegen_->MaybeRecordNativeDebugInfo(info, info->GetDexPc()); +} + +void CodeGeneratorARM::GenerateNop() { + __ nop(); } void LocationsBuilderARM::HandleCondition(HCondition* cond) { |