diff options
| author | 2017-03-28 07:55:30 +0000 | |
|---|---|---|
| committer | 2017-03-28 07:55:31 +0000 | |
| commit | 7359649f638859e265f252b2301a15c4b7bbafa4 (patch) | |
| tree | 5ea16cb6e50976e4754ea092f9761cb0eba97bd4 /compiler/optimizing/bounds_check_elimination.cc | |
| parent | da3f60aed24d6e804f3b6393e74c62b8de0b4a26 (diff) | |
| parent | 6f8e2c9913b24f746a154dda700f609cee3095f9 (diff) | |
Merge "Make data dependency around HDeoptimize correct."
Diffstat (limited to 'compiler/optimizing/bounds_check_elimination.cc')
| -rw-r--r-- | compiler/optimizing/bounds_check_elimination.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/optimizing/bounds_check_elimination.cc b/compiler/optimizing/bounds_check_elimination.cc index 2f318530f1..476906a768 100644 --- a/compiler/optimizing/bounds_check_elimination.cc +++ b/compiler/optimizing/bounds_check_elimination.cc @@ -1619,8 +1619,8 @@ class BCEVisitor : public HGraphVisitor { void InsertDeoptInLoop(HLoopInformation* loop, HBasicBlock* block, HInstruction* condition) { HInstruction* suspend = loop->GetSuspendCheck(); block->InsertInstructionBefore(condition, block->GetLastInstruction()); - HDeoptimize* deoptimize = - new (GetGraph()->GetArena()) HDeoptimize(condition, suspend->GetDexPc()); + HDeoptimize* deoptimize = new (GetGraph()->GetArena()) HDeoptimize( + GetGraph()->GetArena(), condition, HDeoptimize::Kind::kBCE, suspend->GetDexPc()); block->InsertInstructionBefore(deoptimize, block->GetLastInstruction()); if (suspend->HasEnvironment()) { deoptimize->CopyEnvironmentFromWithLoopPhiAdjustment( @@ -1632,8 +1632,8 @@ class BCEVisitor : public HGraphVisitor { void InsertDeoptInBlock(HBoundsCheck* bounds_check, HInstruction* condition) { HBasicBlock* block = bounds_check->GetBlock(); block->InsertInstructionBefore(condition, bounds_check); - HDeoptimize* deoptimize = - new (GetGraph()->GetArena()) HDeoptimize(condition, bounds_check->GetDexPc()); + HDeoptimize* deoptimize = new (GetGraph()->GetArena()) HDeoptimize( + GetGraph()->GetArena(), condition, HDeoptimize::Kind::kBCE, bounds_check->GetDexPc()); block->InsertInstructionBefore(deoptimize, bounds_check); deoptimize->CopyEnvironmentFrom(bounds_check->GetEnvironment()); } |