dwarf2out: Handle pc_rtx as return column in REG_CFA_OFFSET too.

        * dwarf2out.c (dwarf2out_frame_debug_cfa_offset): Allow PC_RTX
        as a source, and interpret that as DWARF_FRAME_RETURN_COLUMN.

From-SVN: r175728

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 277fc9eb2760d0bc8445974b284a3532b6cf2b60..2358289f64f0c03fc237ac97a5b571ede3db1cb0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30  Richard Henderson  <rth@redhat.com>
+
+       * dwarf2out.c (dwarf2out_frame_debug_cfa_offset): Allow PC_RTX
+       as a source, and interpret that as DWARF_FRAME_RETURN_COLUMN.
+
 2011-06-30  Richard Henderson  <rth@redhat.com>
 
        * dwarf2out.c (struct reg_saved_in_data): Provide a typedef.

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 8aa2eb2d4d17e8b83c4304a9a189ccdc09e5f742..8e543919ffe5df756e76d1eb7f9c6f28a4f17333 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -1982,6 +1982,7 @@ dwarf2out_frame_debug_cfa_offset (rtx set, const char *label)
 {
   HOST_WIDE_INT offset;
   rtx src, addr, span;
+  unsigned int sregno;
 
   src = XEXP (set, 1);
   addr = XEXP (set, 0);
@@ -2003,12 +2004,21 @@ dwarf2out_frame_debug_cfa_offset (rtx set, const char *label)
       gcc_unreachable ();
     }
 
-  span = targetm.dwarf_register_span (src);
+  if (src == pc_rtx)
+    {
+      span = NULL;
+      sregno = DWARF_FRAME_RETURN_COLUMN;
+    }
+  else 
+    {
+      span = targetm.dwarf_register_span (src);
+      sregno = DWARF_FRAME_REGNUM (REGNO (src));
+    }
 
   /* ??? We'd like to use queue_reg_save, but we need to come up with
      a different flushing heuristic for epilogues.  */
   if (!span)
-    reg_save (label, DWARF_FRAME_REGNUM (REGNO (src)), INVALID_REGNUM, offset);
+    reg_save (label, sregno, INVALID_REGNUM, offset);
   else
     {
       /* We have a PARALLEL describing where the contents of SRC live.
@@ -2024,8 +2034,8 @@ dwarf2out_frame_debug_cfa_offset (rtx set, const char *label)
        {
          rtx elem = XVECEXP (span, 0, par_index);
 
-         reg_save (label, DWARF_FRAME_REGNUM (REGNO (elem)),
-                   INVALID_REGNUM, span_offset);
+         sregno = DWARF_FRAME_REGNUM (REGNO (src));
+         reg_save (label, sregno, INVALID_REGNUM, span_offset);
          span_offset += GET_MODE_SIZE (GET_MODE (elem));
        }
     }