diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-06 21:10:38 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-06 21:10:38 +0000 |
| commit | ba431ce5eb890c637e0d6743a656b4bd619edeed (patch) | |
| tree | 91b8b18aed5b3d7bec533681eb56d52574724b65 | |
| parent | 9e2f74d16c9d926f453ca32ac31a8efe6a01c491 (diff) | |
| download | ppe42-gcc-ba431ce5eb890c637e0d6743a656b4bd619edeed.tar.gz ppe42-gcc-ba431ce5eb890c637e0d6743a656b4bd619edeed.zip | |
PR c++/9400
* decl.c (pushdecl): Don't check for shadowing of DECL_ARTIFICIAL
PARM_DECLs.
PR c++/9400
* g++.dg/warn/Wshadow-2.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63904 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Wshadow-2.C | 10 |
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7d62350a0a4..94fb8840fcb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2003-03-06 Mark Mitchell <mark@codesourcery.com> + PR c++/9400 + * decl.c (pushdecl): Don't check for shadowing of DECL_ARTIFICIAL + PARM_DECLs. + PR c++/9791 * class.c (get_basefndecls): Use lookup_fnfields_1. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a320ef0615c..fb3631329e2 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4101,7 +4101,9 @@ pushdecl (tree x) if (oldlocal != NULL_TREE && !DECL_EXTERNAL (x) /* Inline decls shadow nothing. */ && !DECL_FROM_INLINE (x) - && TREE_CODE (oldlocal) == PARM_DECL) + && TREE_CODE (oldlocal) == PARM_DECL + /* Don't check the `this' parameter. */ + && !DECL_ARTIFICIAL (oldlocal)) { bool err = false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1b7c6d38bb6..964228f7d55 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2003-03-06 Mark Mitchell <mark@codesourcery.com> + PR c++/9400 + * g++.dg/warn/Wshadow-2.C: New test. + PR c++/9791 * g++.dg/warn/Woverloaded-1.C: New test. diff --git a/gcc/testsuite/g++.dg/warn/Wshadow-2.C b/gcc/testsuite/g++.dg/warn/Wshadow-2.C new file mode 100644 index 00000000000..a3e9428b684 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wshadow-2.C @@ -0,0 +1,10 @@ +/* { dg-options "-Wshadow" } */ + +struct A { + void a1 () { + struct B { B() {} }; // There should be no warning here. + } + void a2 () { + struct B { }; + } +}; |
