diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2016-09-12 22:05:33 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2016-09-12 22:05:33 +0000 |
| commit | 0719b5b9b458cb3eb9f0823f0dacdfe1a71214dd (patch) | |
| tree | cf0844758239b6ec41fa070e4fb4b4fbcbb9e506 /compiler/optimizing/code_generator_arm.cc | |
| parent | 7aa7560683626c7893011271c241b3265ded1dc3 (diff) | |
Revert "Use implicit null checks inside try blocks."
Fails gcstress tests.
This reverts commit 7aa7560683626c7893011271c241b3265ded1dc3.
Change-Id: I4f5c89048b9ffddbafa02f3001e329ff87058ca2
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 4f80931b18..5301a6bb3e 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) { |