From cf93a5cd9c978f59113d42f9f642fab5e2cc8877 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Tue, 16 Jun 2015 11:33:24 +0000
Subject: Revert "Revert "ART: Implement literal pool for arm, fix branch
 fixup.""

This reverts commit fbeb4aede0ddc5b1e6a5a3a40cc6266fe8518c98.

Adjust block label positions. Bad catch block labels were the
reason for the revert.

Change-Id: Ia6950d639d46b9da6b07f3ade63ab46d03d63310
---
 compiler/optimizing/optimizing_cfi_test.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'compiler/optimizing/optimizing_cfi_test.cc')

diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc
index b0d1433667..fe3bb1a2b4 100644
--- a/compiler/optimizing/optimizing_cfi_test.cc
+++ b/compiler/optimizing/optimizing_cfi_test.cc
@@ -71,6 +71,8 @@ class OptimizingCFITest : public CFITest {
         }
       }
     }
+    GrowableArray<HBasicBlock*> blocks(&allocator, 0);
+    code_gen->block_order_ = &blocks;
     code_gen->ComputeSpillMask();
     code_gen->SetFrameSize(frame_size);
     code_gen->GenerateFrameEntry();
-- 
cgit v1.2.3-59-g8ed1b