diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-14 17:04:04 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-14 17:04:04 +0000 |
| commit | 18a20006d0f6a6c6061542dd2d2e2522d25e9d35 (patch) | |
| tree | 76e3155ad284843c0ee3e67ab11f815fcc73029e /gcc | |
| parent | 11964566ad7690c109fcd0568fdcfe19343b7a3e (diff) | |
| download | gcc-18a20006d0f6a6c6061542dd2d2e2522d25e9d35.tar.gz | |
PR c++/39763
* name-lookup.c (pushdecl_maybe_friend): Avoid all warnings
about shadowing by tentative parms.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146053 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 22 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Wshadow-4.C | 12 |
4 files changed, 35 insertions, 10 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d7db8656b1c..e335f9e1830 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-04-14 Jason Merrill <jason@redhat.com> + + PR c++/39763 + * name-lookup.c (pushdecl_maybe_friend): Avoid all warnings + about shadowing by tentative parms. + 2009-04-13 Jason Merrill <jason@redhat.com> PR c++/39480 diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 2eebb79f278..b47c0c55fd8 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -1008,13 +1008,18 @@ pushdecl_maybe_friend (tree x, bool is_friend) && TREE_PUBLIC (x)) TREE_PUBLIC (name) = 1; + /* Don't complain about the parms we push and then pop + while tentatively parsing a function declarator. */ + if (TREE_CODE (x) == PARM_DECL && DECL_CONTEXT (x) == NULL_TREE) + /* Ignore. */; + /* Warn if shadowing an argument at the top level of the body. */ - if (oldlocal != NULL_TREE && !DECL_EXTERNAL (x) - /* Inline decls shadow nothing. */ - && !DECL_FROM_INLINE (x) - && TREE_CODE (oldlocal) == PARM_DECL - /* Don't check the `this' parameter. */ - && !DECL_ARTIFICIAL (oldlocal)) + else if (oldlocal != NULL_TREE && !DECL_EXTERNAL (x) + /* Inline decls shadow nothing. */ + && !DECL_FROM_INLINE (x) + && TREE_CODE (oldlocal) == PARM_DECL + /* Don't check the `this' parameter. */ + && !DECL_ARTIFICIAL (oldlocal)) { bool err = false; @@ -1038,10 +1043,7 @@ pushdecl_maybe_friend (tree x, bool is_friend) } } - if (warn_shadow && !err - /* Don't complain about the parms we push and then pop - while tentatively parsing a function declarator. */ - && !(TREE_CODE (x) == PARM_DECL && DECL_CONTEXT (x) == NULL_TREE)) + if (warn_shadow && !err) { warning (OPT_Wshadow, "declaration of %q#D shadows a parameter", x); warning (OPT_Wshadow, "%Jshadowed declaration is here", oldlocal); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d3405bee457..d0473e7ca07 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-04-14 Jason Merrill <jason@redhat.com> + + PR c++/39763 + * g++.dg/warn/Wshadow-4.C: Extend. + 2009-04-14 Uros Bizjak <ubizjak@gmail.com> * gcc.target/alpha/pr39740.c (dg-options): Add -mexplicit-relocs. diff --git a/gcc/testsuite/g++.dg/warn/Wshadow-4.C b/gcc/testsuite/g++.dg/warn/Wshadow-4.C index 16399b2fb60..22386534bdb 100644 --- a/gcc/testsuite/g++.dg/warn/Wshadow-4.C +++ b/gcc/testsuite/g++.dg/warn/Wshadow-4.C @@ -18,3 +18,15 @@ int foo(int infoo) // { dg-warning "shadowed declaration" } }; return outfoo; } + +// PR c++/39763 +int foo2(void) +{ + int infoo = 0; // { dg-warning "shadowed declaration" } + int outfoo( INetURLObject( infoo ).GetMainURL()); // { dg-bogus "shadows" } + struct A + { + void f(int infoo) { } // { dg-warning "shadows a previous local" } + }; + return outfoo; +} |