commit fbeb4aede0ddc5b1e6a5a3a40cc6266fe8518c98
author Vladimir Marko <vmarko@google.com> Tue Jun 16 11:32:01 2015 +0000
committer Vladimir Marko <vmarko@google.com> Tue Jun 16 11:32:01 2015 +0000
tree 76ab28cf259def4dccec529df217fd760f27d2aa
parent f38caa68cce551fb153dff37d01db518e58ed00f

Revert "ART: Implement literal pool for arm, fix branch fixup."

This reverts commit f38caa68cce551fb153dff37d01db518e58ed00f.

Change-Id: Id88b82cc949d288cfcdb3c401b96f884b777fc40
Reason: broke the tests.

compiler/linker/arm64/relative_patcher_arm64.cc

diff --git a/compiler/linker/arm64/relative_patcher_arm64.cc b/compiler/linker/arm64/relative_patcher_arm64.cc
index 29355d6..ee48789 100644
--- a/compiler/linker/arm64/relative_patcher_arm64.cc
+++ b/compiler/linker/arm64/relative_patcher_arm64.cc
@@ -233,7 +233,7 @@
       kArm64PointerSize).Int32Value());
   assembler.JumpTo(ManagedRegister(arm64::X0), offset, ManagedRegister(arm64::IP0));
   // Ensure we emit the literal pool.
-  assembler.FinalizeCode();
+  assembler.EmitSlowPaths();
   std::vector<uint8_t> thunk_code(assembler.CodeSize());
   MemoryRegion code(thunk_code.data(), thunk_code.size());
   assembler.FinalizeInstructions(code);