summaryrefslogtreecommitdiff
path: root/compiler/utils/arm64/assembler_arm64.h
diff options
context:
space:
mode:
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
commitcf93a5cd9c978f59113d42f9f642fab5e2cc8877 (patch)
tree55162627fcbf2cb7913a735c7ed89e8e4b5e84d7 /compiler/utils/arm64/assembler_arm64.h
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/utils/arm64/assembler_arm64.h')
-rw-r--r--compiler/utils/arm64/assembler_arm64.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/arm64/assembler_arm64.h b/compiler/utils/arm64/assembler_arm64.h
index fa9faed66b..b53c11bc24 100644
--- a/compiler/utils/arm64/assembler_arm64.h
+++ b/compiler/utils/arm64/assembler_arm64.h
@@ -73,8 +73,8 @@ class Arm64Assembler FINAL : public Assembler {
delete vixl_masm_;
}
- // Emit slow paths queued during assembly.
- void EmitSlowPaths();
+ // Finalize the code.
+ void FinalizeCode() OVERRIDE;
// Size of generated code.
size_t CodeSize() const;