From 56e1accf3966ae92e151567abf4561ef3f6466f4 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 30 Jun 2015 15:41:36 +0100 Subject: ART: Changes to try-catch in GraphBuilder This patch adds an additional case into the insertion algorithm for HTryBoundary inside HGraphBuilder in order to better handle catch blocks covered by a TryItem. Building SSA form also required to stop combining HTryBoundaries for neighbouring TryItems because it was not clear which exception handlers belong to which try block. Change-Id: Ic68bd6ef98fee784609fa593cb08dca1f00a15e0 --- compiler/optimizing/nodes.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'compiler/optimizing/nodes.cc') diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 881f9ec117..b82e37cb4e 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -1050,6 +1050,7 @@ HBasicBlock* HBasicBlock::SplitBefore(HInstruction* cursor) { successors_.Reset(); AddSuccessor(new_block); + GetGraph()->AddBlock(new_block); return new_block; } -- cgit v1.2.3-59-g8ed1b