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/jni/jni_cfi_test.cc

diff --git a/compiler/jni/jni_cfi_test.cc b/compiler/jni/jni_cfi_test.cc
index 016f28e..3a0d520 100644
--- a/compiler/jni/jni_cfi_test.cc
+++ b/compiler/jni/jni_cfi_test.cc
@@ -56,7 +56,7 @@
     jni_asm->IncreaseFrameSize(32);
     jni_asm->DecreaseFrameSize(32);
     jni_asm->RemoveFrame(frame_size, callee_save_regs);
-    jni_asm->FinalizeCode();
+    jni_asm->EmitSlowPaths();
     std::vector<uint8_t> actual_asm(jni_asm->CodeSize());
     MemoryRegion code(&actual_asm[0], actual_asm.size());
     jni_asm->FinalizeInstructions(code);