OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/39763 (-Wshadow reports shadowed declarations for parameters of unnamed temp objects) 

PR c++/39763
        * name-lookup.c (pushdecl_maybe_friend): Avoid all warnings
        about shadowing by tentative parms.

From-SVN: r146054
This commit is contained in:
Jason Merrill 2009-04-14 13:14:04 -04:00 committed by Jason Merrill
parent 04cc7cdfe0
commit aa5e8d0ba3
4 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -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

22
gcc/cp/name-lookup.c
View File

@ -1002,13 +1002,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;
@ -1032,10 +1037,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);

5
gcc/testsuite/ChangeLog
View File

@ -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>
Backport from mainline:

12
gcc/testsuite/g++.dg/warn/Wshadow-4.C
View File

@ -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;
}