commit 6134ba19ac3a9ed9a4a88fac787fcfcea9fd712b
author Vladimir Marko <vmarko@google.com> Thu Apr 14 11:27:34 2016 +0100
committer Vladimir Marko <vmarko@google.com> Thu Apr 14 11:27:34 2016 +0100
tree cba6a84457c976c73e4976b1ffef323058a0fc38
parent 8d4b37ed048487561358e13e2a18ad9ca0dab3c0

Fix CFI fixups for long branches on MIPS.

Change-Id: Ibc078e6dc5d7ef423c6a3db855f19f1426e0ea5a

compiler/utils/assembler.h

diff --git a/compiler/utils/assembler.h b/compiler/utils/assembler.h
index 4ea85a2..f70fe04 100644
--- a/compiler/utils/assembler.h
+++ b/compiler/utils/assembler.h
@@ -306,8 +306,10 @@
   // Override the last delayed PC. The new PC can be out of order.
   void OverrideDelayedPC(size_t pc) {
     DCHECK(delay_emitting_advance_pc_);
-    DCHECK(!delayed_advance_pcs_.empty());
-    delayed_advance_pcs_.back().pc = pc;
+    if (enabled_) {
+      DCHECK(!delayed_advance_pcs_.empty());
+      delayed_advance_pcs_.back().pc = pc;
+    }
   }
 
   // Return the number of delayed advance PC entries.