From 64cf1262acdfe754cf395f1f4f6992376ee8de65 Mon Sep 17 00:00:00 2001 From: mpolacek Date: Thu, 5 Jun 2014 05:30:39 +0000 Subject: [PATCH] PR c/48062 * c-decl.c (warn_if_shadowing): Call inform instead of warning_at. Print note only if the warning was printed. * gcc.dg/Wshadow-1.c: Use dg-message for "shadowed declaration". * gcc.dg/Wshadow-3.c: Likewise. * gcc.dg/pr48062.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211254 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/c/ChangeLog | 6 ++++++ gcc/c/c-decl.c | 22 +++++++++++++--------- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.dg/Wshadow-1.c | 6 +++--- gcc/testsuite/gcc.dg/Wshadow-3.c | 4 ++-- gcc/testsuite/gcc.dg/pr48062.c | 13 +++++++++++++ 6 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr48062.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index c51bfb49580..7bd3ce36897 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2014-06-05 Marek Polacek + + PR c/48062 + * c-decl.c (warn_if_shadowing): Call inform instead of warning_at. + Print note only if the warning was printed. + 2014-06-04 Igor Zamyatin PR c/58942 diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index dc8dbc2fb3c..8fb329691ec 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -2601,6 +2601,7 @@ warn_if_shadowing (tree new_decl) DECL_SOURCE_LOCATION (b->decl)))) { tree old_decl = b->decl; + bool warned = false; if (old_decl == error_mark_node) { @@ -2609,8 +2610,9 @@ warn_if_shadowing (tree new_decl) break; } else if (TREE_CODE (old_decl) == PARM_DECL) - warning (OPT_Wshadow, "declaration of %q+D shadows a parameter", - new_decl); + warned = warning (OPT_Wshadow, + "declaration of %q+D shadows a parameter", + new_decl); else if (DECL_FILE_SCOPE_P (old_decl)) { /* Do not warn if a variable shadows a function, unless @@ -2620,9 +2622,10 @@ warn_if_shadowing (tree new_decl) && !FUNCTION_POINTER_TYPE_P (TREE_TYPE (new_decl))) continue; - warning_at (DECL_SOURCE_LOCATION (new_decl), OPT_Wshadow, - "declaration of %qD shadows a global declaration", - new_decl); + warned = warning_at (DECL_SOURCE_LOCATION (new_decl), OPT_Wshadow, + "declaration of %qD shadows a global " + "declaration", + new_decl); } else if (TREE_CODE (old_decl) == FUNCTION_DECL && DECL_BUILT_IN (old_decl)) @@ -2632,11 +2635,12 @@ warn_if_shadowing (tree new_decl) break; } else - warning (OPT_Wshadow, "declaration of %q+D shadows a previous local", - new_decl); + warned = warning (OPT_Wshadow, "declaration of %q+D shadows a " + "previous local", new_decl); - warning_at (DECL_SOURCE_LOCATION (old_decl), OPT_Wshadow, - "shadowed declaration is here"); + if (warned) + inform (DECL_SOURCE_LOCATION (old_decl), + "shadowed declaration is here"); break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c19c8d065ce..6c7943bda60 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-06-05 Marek Polacek + + PR c/48062 + * gcc.dg/Wshadow-1.c: Use dg-message for "shadowed declaration". + * gcc.dg/Wshadow-3.c: Likewise. + * gcc.dg/pr48062.c: New test. + 2014-06-04 Paolo Carlini PR c++/43453 diff --git a/gcc/testsuite/gcc.dg/Wshadow-1.c b/gcc/testsuite/gcc.dg/Wshadow-1.c index 40073f337b4..6075711f5da 100644 --- a/gcc/testsuite/gcc.dg/Wshadow-1.c +++ b/gcc/testsuite/gcc.dg/Wshadow-1.c @@ -5,7 +5,7 @@ /* Source: Neil Booth, 5 Dec 2001. */ -int decl1; /* { dg-warning "shadowed declaration" } */ +int decl1; /* { dg-message "shadowed declaration" } */ void foo (double decl1) /* { dg-warning "shadows a global decl" } */ { } @@ -16,7 +16,7 @@ void foo1 (int d) /* { dg-message "note: previous definition" } */ /* { dg-error "redeclared as different" "" { target *-*-* } 15 } */ } -void foo2 (int d) /* { dg-warning "shadowed declaration" } */ +void foo2 (int d) /* { dg-message "shadowed declaration" } */ { { double d; /* { dg-warning "shadows a parameter" } */ @@ -25,7 +25,7 @@ void foo2 (int d) /* { dg-warning "shadowed declaration" } */ void foo3 () { - int local; /* { dg-warning "shadowed declaration" } */ + int local; /* { dg-message "shadowed declaration" } */ { int local; /* { dg-warning "shadows a previous local" } */ } diff --git a/gcc/testsuite/gcc.dg/Wshadow-3.c b/gcc/testsuite/gcc.dg/Wshadow-3.c index a7f06a26f96..ce2879c0fb8 100644 --- a/gcc/testsuite/gcc.dg/Wshadow-3.c +++ b/gcc/testsuite/gcc.dg/Wshadow-3.c @@ -5,7 +5,7 @@ /* { dg-do compile } */ /* { dg-options "-std=gnu89 -Wshadow" } */ -int v; /* { dg-warning "shadowed declaration" } */ +int v; /* { dg-message "shadowed declaration" } */ int f1(int v); int f2(int v, int x[v]); /* { dg-warning "declaration of 'v' shadows a global declaration" } */ int f3(int v, int y[sizeof(v)]); /* { dg-warning "declaration of 'v' shadows a global declaration" } */ @@ -18,4 +18,4 @@ int f9(x) int x; { return 0; } int f10(v) { return 0; } /* { dg-warning "declaration of 'v' shadows a global declaration" } */ int f11(int a, int b(int a)); int f12(int a, int b(int a, int x[a])); /* { dg-warning "declaration of 'a' shadows a parameter" } */ -/* { dg-warning "shadowed declaration" "outer parm" { target *-*-* } 20 } */ +/* { dg-message "shadowed declaration" "outer parm" { target *-*-* } 20 } */ diff --git a/gcc/testsuite/gcc.dg/pr48062.c b/gcc/testsuite/gcc.dg/pr48062.c new file mode 100644 index 00000000000..0f4cdde2e16 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr48062.c @@ -0,0 +1,13 @@ +/* PR c/48062 */ +/* { dg-do compile } */ +/* { dg-options "-Wshadow" } */ + +int +main (void) +{ + int i; /* { dg-bogus "shadowed declaration" } */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" + { int i; } +#pragma GCC diagnostic pop +} -- 2.11.4.GIT