PR testsuite/47622

	Revert
	2011-02-05  Jie Zhang  <jie@codesourcery.com>
	PR debug/42631
	* web.c (entry_register): Don't clobber the number of the
	first uninitialized reference in used[].

	testsuite/
	PR testsuite/47622
	Revert
	2011-02-05  Jie Zhang  <jie@codesourcery.com>
	PR debug/42631
	* gcc.dg/pr42631.c: Update test.
	* gcc.dg/pr42631-2.c: New test.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0b46ae8..85e5f09 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-10  Jie Zhang  <jie@codesourcery.com>
+
+       PR testsuite/47622
+       Revert
+       2011-02-05  Jie Zhang  <jie@codesourcery.com>
+       PR debug/42631
+       * web.c (entry_register): Don't clobber the number of the
+       first uninitialized reference in used[].
+
 2011-02-09  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/47664

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e68a483..a3780dd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-10  Jie Zhang  <jie@codesourcery.com>
+
+       PR testsuite/47622
+       Revert
+       2011-02-05  Jie Zhang  <jie@codesourcery.com>
+       PR debug/42631
+       * gcc.dg/pr42631.c: Update test.
+       * gcc.dg/pr42631-2.c: New test.
+
 2011-02-09  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/47352

diff --git a/gcc/testsuite/gcc.dg/pr42631-2.c b/gcc/testsuite/gcc.dg/pr42631-2.c
deleted file mode 100644 (file)
index a5da2de..0000000
--- a/gcc/testsuite/gcc.dg/pr42631-2.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -funroll-loops -fdump-rtl-web" } */
-
-foo()
-{
-}
-
-/* { dg-final { scan-rtl-dump-not "Web oldreg" "web" } } */
-/* { dg-final { cleanup-rtl-dump "web" } } */

diff --git a/gcc/testsuite/gcc.dg/pr42631.c b/gcc/testsuite/gcc.dg/pr42631.c
index 3d6c229..f5ac5a5 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr42631.c
+++ b/gcc/testsuite/gcc.dg/pr42631.c
@@ -14,13 +14,10 @@
    combine uninitialized uses into a single web.  */
 
 /* { dg-do compile } */
-/* { dg-options "-g -O1 -funroll-loops -fcompare-debug -fdump-rtl-web" } */
+/* { dg-options "-g -O1 -funroll-loops -fcompare-debug" } */
 
 void foo()
 {
   unsigned k;
   while (--k > 0);
 }
-
-/* { dg-final { scan-rtl-dump-not "Web oldreg" "web" } } */
-/* { dg-final { cleanup-rtl-dump "web" } } */

diff --git a/gcc/web.c b/gcc/web.c
index 7014aa5..9b84924 100644 (file)
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -260,11 +260,7 @@ entry_register (struct web_entry *entry, df_ref ref, unsigned int *used)
      and there won't be any use for the other values when we get to
      this point.  */
   if (used[REGNO (reg)] != 1)
-    {
-      newreg = reg;
-      if (!used[REGNO (reg)])
-       used[REGNO (reg)] = 1;
-    }
+    newreg = reg, used[REGNO (reg)] = 1;
   else
     {
       newreg = gen_reg_rtx (GET_MODE (reg));