commit 10ef6941648aad04d54527d4a7a6070bf7065e88
author Vladimir Marko <vmarko@google.com> Thu Oct 22 15:25:54 2015 +0100
committer Vladimir Marko <vmarko@google.com> Wed Nov 04 14:54:23 2015 +0000
tree 50fe6b50a3020ec7d25fbd5e4393db1c04452ce7
parent c74e69f831608964f89ac7a641fbcc09156eefaa

Delay emitting CFI PC adjustments until after Thumb2/Mips fixup.

On Mips also take into account out-of-order CFI data emitted
from EmitBranches().

Change-Id: I03b0b0b4c2b1ea31a02699ef5fa1c55aa42c23c3

compiler/jni/jni_cfi_test.cc

diff --git a/compiler/jni/jni_cfi_test.cc b/compiler/jni/jni_cfi_test.cc
index 0bfe8a2..8832c84 100644
--- a/compiler/jni/jni_cfi_test.cc
+++ b/compiler/jni/jni_cfi_test.cc
@@ -51,6 +51,7 @@
 
     // Assemble the method.
     std::unique_ptr<Assembler> jni_asm(Assembler::Create(isa));
+    jni_asm->cfi().SetEnabled(true);
     jni_asm->BuildFrame(frame_size, mr_conv->MethodRegister(),
                         callee_save_regs, mr_conv->EntrySpills());
     jni_asm->IncreaseFrameSize(32);