diff options
| author | 2015-06-24 13:56:48 +0000 | |
|---|---|---|
| committer | 2015-06-24 13:56:49 +0000 | |
| commit | b809daaffdd42dc01457ae06ae83f2d7ebdb5e65 (patch) | |
| tree | 16c3d455297fbf79a1d084392aada209ac2e8704 /compiler/optimizing/nodes.cc | |
| parent | 1c7f2f10230baf7a549af5bfd16fd3f0fb73ba21 (diff) | |
| parent | fe659462e7d58bb2585b1bd029f9e08fd9dd32ae (diff) | |
Merge "ART: Stop creating a fallthrough block for Goto"
Diffstat (limited to 'compiler/optimizing/nodes.cc')
| -rw-r--r-- | compiler/optimizing/nodes.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 3891a152c4..a6390af1f2 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -1050,9 +1050,8 @@ HBasicBlock* HBasicBlock::SplitAfter(HInstruction* cursor) { bool HBasicBlock::IsSingleGoto() const { HLoopInformation* loop_info = GetLoopInformation(); - // TODO: Remove the null check b/19084197. - return GetFirstInstruction() != nullptr - && GetPhis().IsEmpty() + DCHECK(EndsWithControlFlowInstruction()); + return GetPhis().IsEmpty() && GetFirstInstruction() == GetLastInstruction() && GetLastInstruction()->IsGoto() // Back edges generate the suspend check. |