From: Jason Merrill <jason@redhat.com>
Date: Sun, 17 Mar 2013 02:38:01 +0000 (-0400)
Subject: re PR c++/55357 (-Wshadow warns about lambda function parameters matching variables... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4c7ce543bead79637fcdabf754edc5e0a8809d8;p=gcc.git

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c0e15426719..22d408b2d2f 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 20fe2433777..e46b4bfae9c 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 00000000000..bb06bfe4afa
--- /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;
+  };
+}