diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-06-16 11:33:24 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2015-06-17 09:43:51 +0100 |
| commit | cf93a5cd9c978f59113d42f9f642fab5e2cc8877 (patch) | |
| tree | 55162627fcbf2cb7913a735c7ed89e8e4b5e84d7 /compiler/optimizing/code_generator_arm.h | |
| parent | db40ea768bd914125c3754dacb9b6f534a2e2399 (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/code_generator_arm.h')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/optimizing/code_generator_arm.h b/compiler/optimizing/code_generator_arm.h index 824e48cc9f..1599a23568 100644 --- a/compiler/optimizing/code_generator_arm.h +++ b/compiler/optimizing/code_generator_arm.h @@ -298,6 +298,8 @@ class CodeGeneratorARM : public CodeGenerator { block_labels_.SetSize(GetGraph()->GetBlocks().Size()); } + void Finalize(CodeAllocator* allocator) OVERRIDE; + const ArmInstructionSetFeatures& GetInstructionSetFeatures() const { return isa_features_; } |