diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2016-09-12 22:07:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-12 22:07:10 +0000 |
| commit | e204051d3cc3b1be2e91f26621966c79c82fa74c (patch) | |
| tree | 63270cd53f278140c7aef246925b39c858ccc55e /compiler/optimizing/code_generator_arm.cc | |
| parent | f0c41505e1d241cf2191d3db377a26ce0bb43b51 (diff) | |
| parent | 0719b5b9b458cb3eb9f0823f0dacdfe1a71214dd (diff) | |
Merge "Revert "Use implicit null checks inside try blocks.""
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 40c2b9c1ec..3cc2598f8f 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -4251,7 +4251,14 @@ void InstructionCodeGeneratorARM::VisitUnresolvedStaticFieldSet( } void LocationsBuilderARM::VisitNullCheck(HNullCheck* instruction) { - codegen_->CreateNullCheckLocations(instruction); + LocationSummary::CallKind call_kind = instruction->CanThrowIntoCatchBlock() + ? LocationSummary::kCallOnSlowPath + : LocationSummary::kNoCall; + LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(instruction, call_kind); + locations->SetInAt(0, Location::RequiresRegister()); + if (instruction->HasUses()) { + locations->SetOut(Location::SameAsFirstInput()); + } } void CodeGeneratorARM::GenerateImplicitNullCheck(HNullCheck* instruction) { |