From a65930de077a4d7c1110e66ccd950061a85353d0 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Fri, 26 Jun 2015 10:26:47 +0100 Subject: [PATCH] ART: Fix gtests after try/catch change The try/catch CL changed the order in which instructions were added into entry/exit blocks which broke the sensitive gtests. This patch swaps the order back. Change-Id: Ib337491e5571a2cd38d6784275642f008886cc2a --- compiler/optimizing/builder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 742429cc5..0a0b4a6c3 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -467,11 +467,11 @@ bool HGraphBuilder::BuildGraph(const DexFile::CodeItem& code_item) { code_ptr += instruction.SizeInCodeUnits(); } + // Add Exit to the exit block. + exit_block_->AddInstruction(new (arena_) HExit()); // Add the suspend check to the entry block. entry_block_->AddInstruction(new (arena_) HSuspendCheck(0)); entry_block_->AddInstruction(new (arena_) HGoto()); - // Add Exit to the exit block. - exit_block_->AddInstruction(new (arena_) HExit()); // Iterate over blocks covered by TryItems and insert TryBoundaries at entry // and exit points. This requires all control-flow instructions and -- 2.11.0