2009-12-01 Richard Guenther <rguenther@suse.de>

	* final.c (rest_of_clean_state): If -fcompare-debug is
	given dump final insns without UIDs.
	* tree-ssa-live.c (remove_unused_scope_block_p): Remove
	after_inlining checks.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23a091f..f68d758 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-01  Richard Guenther  <rguenther@suse.de>
+
+       * final.c (rest_of_clean_state): If -fcompare-debug is
+       given dump final insns without UIDs.
+       * tree-ssa-live.c (remove_unused_scope_block_p): Remove
+       after_inlining checks.
+
 2009-11-30  Chao-ying Fu  <fu@mips.com>
 
        * config/mips/mips-dsp.md (mips_lhx_<mode>): Use sign_extend.

diff --git a/gcc/final.c b/gcc/final.c
index 5d037f5..0d19562 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -4382,6 +4382,8 @@ rest_of_clean_state (void)
             : "");
 
          flag_dump_noaddr = flag_dump_unnumbered = 1;
+         if (flag_compare_debug_opt || flag_compare_debug)
+           dump_flags |= TDF_NOUID;
 
          for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
            if (LABEL_P (insn))

diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index d75edb5..c0ccb4f 100644 (file)
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -475,11 +475,7 @@ remove_unused_scope_block_p (tree scope)
         type is used or not.  */
 
       else if (debug_info_level == DINFO_LEVEL_NORMAL
-              || debug_info_level == DINFO_LEVEL_VERBOSE
-              /* Removing declarations before inlining is going to affect
-                 DECL_UID that in turn is going to affect hashtables and
-                 code generation.  */
-              || !cfun->after_inlining)
+              || debug_info_level == DINFO_LEVEL_VERBOSE)
        ;
       else
        {
@@ -527,12 +523,6 @@ remove_unused_scope_block_p (tree scope)
       eliminated.  */
    else if (!nsubblocks)
      ;
-   /* If there are live subblocks and we still have some unused variables
-      or types declared, we must keep them.
-      Before inliing we must not depend on debug info verbosity to keep
-      DECL_UIDs stable.  */
-   else if (!cfun->after_inlining && BLOCK_VARS (scope))
-     unused = false;
    /* For terse debug info we can eliminate info on unused variables.  */
    else if (debug_info_level == DINFO_LEVEL_NONE
            || debug_info_level == DINFO_LEVEL_TERSE)