* dwarf2out.c (dwarf2out_frame_debug): Don't assert drap_reg

	has been set.
	(based_loc_descr): Use DW_OP_fbreg for vdrap_reg even when
	drap_reg has not been set.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157463 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 73ec8c1..f5b3467 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+       * dwarf2out.c (dwarf2out_frame_debug): Don't assert drap_reg
+       has been set.
+       (based_loc_descr): Use DW_OP_fbreg for vdrap_reg even when
+       drap_reg has not been set.
+
 2010-03-15  Michael Matz  <matz@suse.de>
 
        PR middle-end/43300

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index c76d54f..8dfe65d 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2760,11 +2760,12 @@ dwarf2out_frame_debug (rtx insn, bool after_p)
        if (REG_P (n))
          {
            dw_fde_ref fde = current_fde ();
-           gcc_assert (fde
-                       && fde->drap_reg != INVALID_REGNUM
-                       && fde->vdrap_reg == INVALID_REGNUM);
-           if (REG_P (n))
-             fde->vdrap_reg = REGNO (n);
+           if (fde)
+             {
+               gcc_assert (fde->vdrap_reg == INVALID_REGNUM);
+               if (REG_P (n))
+                 fde->vdrap_reg = REGNO (n);
+             }
          }
        handled_one = true;
        break;
@@ -12726,7 +12727,6 @@ based_loc_descr (rtx reg, HOST_WIDE_INT offset,
     }
   else if (!optimize
           && fde
-          && fde->drap_reg != INVALID_REGNUM
           && (fde->drap_reg == REGNO (reg)
               || fde->vdrap_reg == REGNO (reg)))
     {