aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4>2006-08-29 15:52:54 +0000
committeramylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4>2006-08-29 15:52:54 +0000
commit4f652d47e74bba4e82d0e165b502beb38861eedc (patch)
tree7c990387a481812ec429ef6fcf7b9d2e03aebf82
parentcf8e3323a685cb38c02438d5c6de2bb2e54457df (diff)
gcc:
2006-08-29 Nathan Sidwell <nathan@codesourcery.com> J"orn Rennecke <joern.rennecke@st.com> PR tree-optimization/17506 * tree-ssa.c (warn_uninit): If warning about a location outside of the current function, note where the variable was declared. testsuite: 2006-08-29 Volker Reichelt <reichelt@igpm.rwth-aachen.de> Kazu Hirata <kazu@codesourcery.com> PR tree-optimization/17506 * gcc.dg/pr17506.c: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116564 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gcc.dg/pr17506.c24
-rw-r--r--gcc/tree-ssa.c8
4 files changed, 44 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bec73d619ff..faf7f8b0084 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-29 Nathan Sidwell <nathan@codesourcery.com>
+ J"orn Rennecke <joern.rennecke@st.com>
+
+ PR tree-optimization/17506
+ * tree-ssa.c (warn_uninit): If warning about a location outside of
+ the current function, note where the variable was declared.
+
2006-08-28 Zdenek Dvorak <dvorakz@suse.cz>
PR tree-optimization/28411
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 21eba05b7d4..5c2b9f4c518 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-29 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+ Kazu Hirata <kazu@codesourcery.com>
+
+ PR tree-optimization/17506
+ * gcc.dg/pr17506.c: New.
+
2006-08-29 J"orn Rennecke <joern.rennecke@st.com>
PR c++/28139
diff --git a/gcc/testsuite/gcc.dg/pr17506.c b/gcc/testsuite/gcc.dg/pr17506.c
new file mode 100644
index 00000000000..44fb90cc770
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr17506.c
@@ -0,0 +1,24 @@
+/* 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-error "note: 'j' was declared here" } */
+ for (; foo (j); ++j)
+ baz ();
+}
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 14466124318..f922e825444 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -1154,7 +1154,7 @@ warn_uninit (tree t, const char *gmsgid, void *data)
tree var = SSA_NAME_VAR (t);
tree def = SSA_NAME_DEF_STMT (t);
tree context = (tree) data;
- location_t * locus;
+ location_t *locus, *fun_locus;
/* Default uses (indicated by an empty definition statement),
are uninitialized. */
@@ -1178,6 +1178,12 @@ warn_uninit (tree t, const char *gmsgid, void *data)
? EXPR_LOCUS (context)
: &DECL_SOURCE_LOCATION (var));
warning (0, gmsgid, locus, var);
+ fun_locus = &DECL_SOURCE_LOCATION (cfun->decl);
+ if (locus->file != fun_locus->file
+ || locus->line < fun_locus->line
+ || locus->line > cfun->function_end_locus.line)
+ inform ("%J%qD was declared here", var, var);
+
TREE_NO_WARNING (var) = 1;
}