re PR testsuite/47622 (FAIL: gcc.dg/pr42631.c scan-rtl-dump-not web "Web oldreg")

	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.

From-SVN: r169997

gcc/ChangeLog

+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

gcc/testsuite/ChangeLog

+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

gcc/testsuite/gcc.dg/pr42631-2.c

-/* { 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" } } */

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" } } */

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));