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
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index 742429c..0a0b4a6 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -467,11 +467,11 @@
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
