From: Richard Henderson <rth@redhat.com>
Date: Fri, 8 Jul 2011 23:48:53 +0000 (-0700)
Subject: dwarf2cfi: Insert notes correctly wrt tablejumps.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=830f11fee4ed84fa3fe0320cdc51c215ec7bc30c;p=gcc.git

dwarf2cfi: Insert notes correctly wrt tablejumps.

PR bootstrap/49680
        * dwarf2cfi.c (dwarf2out_frame_debug): Insert cfi notes after
        any tablejump vector.

From-SVN: r176065
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ad805822fe..3ba9bf7ac50 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-08  Richard Henderson  <rth@redhat.com>
+
+	PR bootstrap/49680
+	* dwarf2cfi.c (dwarf2out_frame_debug): Insert cfi notes after
+	any tablejump vector.
+
 2011-07-08  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/49621
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 44655bb51bc..8031d48682b 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -2180,8 +2180,16 @@ dwarf2out_frame_debug (rtx insn, bool after_p)
   bool handled_one = false;
   bool need_flush = false;
 
-  /* Remember where we are to insert notes.  */
-  cfi_insn = (after_p ? insn : PREV_INSN (insn));
+  /* Remember where we are to insert notes.  Do not separate tablejump
+     insns from their ADDR_DIFF_VEC.  Putting the note after the VEC
+     should be ok.  */
+  if (after_p)
+    {
+      if (!tablejump_p (insn, NULL, &cfi_insn))
+	cfi_insn = insn;
+    }
+  else
+    cfi_insn = PREV_INSN (insn);
 
   if (!NONJUMP_INSN_P (insn) || clobbers_queued_reg_save (insn))
     dwarf2out_flush_queued_reg_saves ();