* dwarf2out.c (def_cfa_1): After DW_CFA_def_cfa_expression

	force using DW_CFA_def_cfa instead of DW_CFA_def_cfa_register
	or DW_CFA_def_cfa_offset{,_sf}.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e282e15..39e8fe7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-27  Jakub Jelinek  <jakub@redhat.com>
+
+       * dwarf2out.c (def_cfa_1): After DW_CFA_def_cfa_expression
+       force using DW_CFA_def_cfa instead of DW_CFA_def_cfa_register
+       or DW_CFA_def_cfa_offset{,_sf}.
+

 2010-04-27  Eric Botcazou  <ebotcazou@adacore.com>
 
        * tree.h: Fix truncated long macros.
 2010-04-27  Eric Botcazou  <ebotcazou@adacore.com>
 
        * tree.h: Fix truncated long macros.

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index e7e2e8f..1f72f90 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -1040,7 +1040,7 @@ def_cfa_1 (const char *label, dw_cfa_location *loc_p)
 
   cfi = new_cfi ();
 
 
   cfi = new_cfi ();
 

-  if (loc.reg == old_cfa.reg && !loc.indirect)
+  if (loc.reg == old_cfa.reg && !loc.indirect && !old_cfa.indirect)

     {
       /* Construct a "DW_CFA_def_cfa_offset <offset>" instruction, indicating
         the CFA register did not change but the offset did.  The data
     {
       /* Construct a "DW_CFA_def_cfa_offset <offset>" instruction, indicating
         the CFA register did not change but the offset did.  The data


@@ -1056,7 +1056,8 @@ def_cfa_1 (const char *label, dw_cfa_location *loc_p)
 #ifndef MIPS_DEBUGGING_INFO  /* SGI dbx thinks this means no offset.  */
   else if (loc.offset == old_cfa.offset
           && old_cfa.reg != INVALID_REGNUM
 #ifndef MIPS_DEBUGGING_INFO  /* SGI dbx thinks this means no offset.  */
   else if (loc.offset == old_cfa.offset
           && old_cfa.reg != INVALID_REGNUM

-          && !loc.indirect)
+          && !loc.indirect
+          && !old_cfa.indirect)

     {
       /* Construct a "DW_CFA_def_cfa_register <register>" instruction,
         indicating the CFA register has changed to <register> but the
     {
       /* Construct a "DW_CFA_def_cfa_register <register>" instruction,
         indicating the CFA register has changed to <register> but the