From fa3091ef031da6c18478fdede12d7762634ee271 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 19 Apr 2016 10:10:17 +0100 Subject: ART: Fix IsLinearOrderWellFormed in liveness analysis Graph may contain nullptr in list of basic blocks when the basic block is removed. So we must handle nullptr explicitly. Bug: 28252537 Change-Id: If430939b8fe793e4a9c974936180d06c1a9f90c6 Signed-off-by: Serguei Katkov --- compiler/optimizing/ssa_liveness_analysis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing/ssa_liveness_analysis.h') diff --git a/compiler/optimizing/ssa_liveness_analysis.h b/compiler/optimizing/ssa_liveness_analysis.h index 719feec468..40dab74a23 100644 --- a/compiler/optimizing/ssa_liveness_analysis.h +++ b/compiler/optimizing/ssa_liveness_analysis.h @@ -971,7 +971,7 @@ class LiveInterval : public ArenaObject { bool IsLinearOrderWellFormed(const HGraph& graph) { for (HBasicBlock* header : graph.GetBlocks()) { - if (!header->IsLoopHeader()) { + if (header == nullptr || !header->IsLoopHeader()) { continue; } -- cgit v1.2.3-59-g8ed1b