diff options
| author | Jason Merrill <jason@redhat.com> | 2013-03-16 22:38:01 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-03-16 22:38:01 -0400 |
| commit | b4c7ce543bead79637fcdabf754edc5e0a8809d8 (patch) | |
| tree | 23bd7ff5f1271a72a06399fd74c878d9fe7e486d | |
| parent | ca2e264dd6e2eb677baebf6ebdad9d5f5dfcdbcd (diff) | |
| download | gcc-b4c7ce543bead79637fcdabf754edc5e0a8809d8.zip gcc-b4c7ce543bead79637fcdabf754edc5e0a8809d8.tar.gz gcc-b4c7ce543bead79637fcdabf754edc5e0a8809d8.tar.bz2 | |
re PR c++/55357 (-Wshadow warns about lambda function parameters matching variables in outer scope)
PR c++/55357
* semantics.c (maybe_add_lambda_conv_op): Clear DECL_NAME of copied
parms to avoid duplicate -Wshadow warnings.
From-SVN: r196739
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C | 9 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c0e1542..22d408b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2013-03-16 Jason Merrill <jason@redhat.com> + PR c++/55357 + * semantics.c (maybe_add_lambda_conv_op): Clear DECL_NAME of copied + parms to avoid duplicate -Wshadow warnings. + * search.c (lookup_base): Handle NULL_TREE. PR c++/56481 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 20fe243..e46b4bf 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -9678,7 +9678,11 @@ maybe_add_lambda_conv_op (tree type) DECL_STATIC_FUNCTION_P (fn) = 1; DECL_ARGUMENTS (fn) = copy_list (DECL_CHAIN (DECL_ARGUMENTS (callop))); for (arg = DECL_ARGUMENTS (fn); arg; arg = DECL_CHAIN (arg)) - DECL_CONTEXT (arg) = fn; + { + /* Avoid duplicate -Wshadow warnings. */ + DECL_NAME (arg) = NULL_TREE; + DECL_CONTEXT (arg) = fn; + } if (nested) DECL_INTERFACE_KNOWN (fn) = 1; diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C new file mode 100644 index 0000000..bb06bfe --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C @@ -0,0 +1,9 @@ +// PR c++/55357 +// { dg-options "-std=c++11 -Wshadow" } + +int main() { + int x = 1; // { dg-warning "shadowed" } + auto const lambda = [](int x) { // { dg-warning "shadows" } + return x; + }; +} |