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/utils/arm/assembler_thumb2.h

diff --git a/compiler/utils/arm/assembler_thumb2.h b/compiler/utils/arm/assembler_thumb2.h
index 38fd244..e183613 100644
--- a/compiler/utils/arm/assembler_thumb2.h
+++ b/compiler/utils/arm/assembler_thumb2.h
@@ -44,6 +44,7 @@
         last_position_adjustment_(0u),
         last_old_position_(0u),
         last_fixup_id_(0u) {
+    cfi().DelayEmittingAdvancePCs();
   }
 
   virtual ~Thumb2Assembler() {
@@ -792,6 +793,7 @@
   void EmitFixups(uint32_t adjusted_code_size);
   void EmitLiterals();
   void EmitJumpTables();
+  void PatchCFI();
 
   static int16_t BEncoding16(int32_t offset, Condition cond);
   static int32_t BEncoding32(int32_t offset, Condition cond);