commit cf93a5cd9c978f59113d42f9f642fab5e2cc8877
author Vladimir Marko <vmarko@google.com> Tue Jun 16 11:33:24 2015 +0000
committer Vladimir Marko <vmarko@google.com> Wed Jun 17 09:43:51 2015 +0100
tree 55162627fcbf2cb7913a735c7ed89e8e4b5e84d7
parent db40ea768bd914125c3754dacb9b6f534a2e2399

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/utils/arm64/assembler_arm64.h

diff --git a/compiler/utils/arm64/assembler_arm64.h b/compiler/utils/arm64/assembler_arm64.h
index fa9faed..b53c11b 100644
--- a/compiler/utils/arm64/assembler_arm64.h
+++ b/compiler/utils/arm64/assembler_arm64.h
@@ -73,8 +73,8 @@
     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;