From 96501113618dd86ec855db2931c1b5f9038c3e51 Mon Sep 17 00:00:00 2001
From: Richard Guenther <rguenther@suse.de>
Date: Thu, 21 Aug 2008 11:22:52 +0000
Subject: [PATCH] re PR testsuite/37182 (Revision 139286 caused
 gcc.dg/pr17506.c and gcc.dg/uninit-15.c)

2008-08-21  Richard Guenther  <rguenther@suse.de>

	PR testsuite/37182
	* gcc.dg/pr17506.c: Remove duplicate testcase.
	* gcc.dg/uninit-15.c: Adjust to allow for both correct
	behaviors, one xfailed.

From-SVN: r139374
---
 gcc/testsuite/ChangeLog          |  7 +++++++
 gcc/testsuite/gcc.dg/pr17506.c   | 24 ------------------------
 gcc/testsuite/gcc.dg/uninit-15.c | 27 ++++++++++++++++++---------
 3 files changed, 25 insertions(+), 33 deletions(-)
 delete mode 100644 gcc/testsuite/gcc.dg/pr17506.c

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e8a0678a37bd..7efe72f222b0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-21  Richard Guenther  <rguenther@suse.de>
+
+	PR testsuite/37182
+	* gcc.dg/pr17506.c: Remove duplicate testcase.
+	* gcc.dg/uninit-15.c: Adjust to allow for both correct
+	behaviors, one xfailed.
+
 2008-08-21  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
 	PR middle-end/179
diff --git a/gcc/testsuite/gcc.dg/pr17506.c b/gcc/testsuite/gcc.dg/pr17506.c
deleted file mode 100644
index 7cca74613e7b..000000000000
--- a/gcc/testsuite/gcc.dg/pr17506.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* PR tree-optimization/17506
-   We issue an uninitialized variable warning at a wrong location at
-   line 11, which is very confusing.  Make sure we print out a note to
-   make it less confusing.  */
-/* { dg-do compile } */
-/* { dg-options "-O1 -Wuninitialized" } */
-
-inline int
-foo (int i)
-{
-  if (i) /* { dg-warning "used uninitialized in this function" } */
-    return 1;
-  return 0;
-}
-
-void baz (void);
-
-void
-bar (void)
-{
-  int j; /* { dg-message "note: 'j' was declared here" } */
-  for (; foo (j); ++j)
-    baz ();
-}
diff --git a/gcc/testsuite/gcc.dg/uninit-15.c b/gcc/testsuite/gcc.dg/uninit-15.c
index dee7a3b211c9..20bea95acd80 100644
--- a/gcc/testsuite/gcc.dg/uninit-15.c
+++ b/gcc/testsuite/gcc.dg/uninit-15.c
@@ -1,17 +1,26 @@
+/* PR tree-optimization/17506
+   We issue an uninitialized variable warning at a wrong location at
+   line 11, which is very confusing.  Make sure we print out a note to
+   make it less confusing.  (xfailed alternative)
+   But it is of course ok if we warn in bar about uninitialized use
+   of j.  (not xfailed alternative)  */
 /* { dg-do compile } */
-/* { dg-options "-O -Wuninitialized" } */
+/* { dg-options "-O1 -Wuninitialized" } */
 
-inline int foo (int i)
+inline int
+foo (int i)
 {
-    if (i) return 1; /* { dg-warning "is used uninitialized" } */
-    return 0;
+  if (i) /* { dg-warning "used uninitialized in this function" "" { xfail *-*-* } } */
+    return 1;
+  return 0;
 }
 
-void baz();
+void baz (void);
 
-void bar()
+void
+bar (void)
 {
-    int j;           /* { dg-message "was declared here" } */
-    for (; foo(j); ++j)
-        baz();
+  int j; /* { dg-message "note: 'j' was declared here" "" { xfail *-*-* } } */
+  for (; foo (j); ++j)  /* { dg-warning "'j' is used uninitialized" } */
+    baz ();
 }
-- 
2.47.2