summaryrefslogtreecommitdiff
path: root/compiler/optimizing/optimizing_cfi_test.cc
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2015-06-16 11:33:24 +0000
committerVladimir Marko <vmarko@google.com>2015-06-17 09:43:51 +0100
commitcf93a5cd9c978f59113d42f9f642fab5e2cc8877 (patch)
tree55162627fcbf2cb7913a735c7ed89e8e4b5e84d7 /compiler/optimizing/optimizing_cfi_test.cc
parentdb40ea768bd914125c3754dacb9b6f534a2e2399 (diff)
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
Diffstat (limited to 'compiler/optimizing/optimizing_cfi_test.cc')
-rw-r--r--compiler/optimizing/optimizing_cfi_test.cc2
1 files changed, 2 insertions, 0 deletions
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();