Patchwork C++ PATCH for c++/50736 (accepting invalid lambda captures)

login
register
mail settings
Submitter Jason Merrill
Date Oct. 17, 2011, 6:58 p.m.
Message ID <4E9C7AB8.9070600@redhat.com>
Download mbox | patch
Permalink /patch/120285/
State New
Headers show

Comments

Jason Merrill - Oct. 17, 2011, 6:58 p.m.
Here we were failing to check whether the thing being captured was an 
automatic variable, as required by the standard.

Tested x86_64-pc-linux-gnu, applying to trunk.

Patch

commit 2e585b32e7c969c1dc2ae7b2a62978b95ed4bf17
Author: Jason Merrill <jason@redhat.com>
Date:   Sun Oct 16 01:15:09 2011 -0400

    	PR c++/50736
    	* parser.c (cp_parser_lambda_introducer): Check for more
    	invalid captures.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index ea0c4dc..bf362f2 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -7630,6 +7630,31 @@  cp_parser_lambda_introducer (cp_parser* parser, tree lambda_expr)
                  /*ambiguous_decls=*/NULL,
                  capture_token->location);
 
+	  if (capture_init_expr == error_mark_node)
+	    {
+	      unqualified_name_lookup_error (capture_id);
+	      continue;
+	    }
+	  else if (DECL_P (capture_init_expr)
+		   && (TREE_CODE (capture_init_expr) != VAR_DECL
+		       && TREE_CODE (capture_init_expr) != PARM_DECL))
+	    {
+	      error_at (capture_token->location,
+			"capture of non-variable %qD ",
+			capture_init_expr);
+	      inform (0, "%q+#D declared here", capture_init_expr);
+	      continue;
+	    }
+	  if (TREE_CODE (capture_init_expr) == VAR_DECL
+	      && decl_storage_duration (capture_init_expr) != dk_auto)
+	    {
+	      pedwarn (capture_token->location, 0, "capture of variable "
+		       "%qD with non-automatic storage duration",
+		       capture_init_expr);
+	      inform (0, "%q+#D declared here", capture_init_expr);
+	      continue;
+	    }
+
 	  capture_init_expr
             = finish_id_expression
                 (capture_id,
@@ -7647,10 +7672,6 @@  cp_parser_lambda_introducer (cp_parser* parser, tree lambda_expr)
                  capture_token->location);
 	}
 
-      if (TREE_CODE (capture_init_expr) == IDENTIFIER_NODE)
-	capture_init_expr
-	  = unqualified_name_lookup_error (capture_init_expr);
-
       if (LAMBDA_EXPR_DEFAULT_CAPTURE_MODE (lambda_expr) != CPLD_NONE
 	  && !explicit_init_p)
 	{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-neg.C
new file mode 100644
index 0000000..82cc984
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-neg.C
@@ -0,0 +1,15 @@ 
+// PR c++/50736
+// { dg-options "-std=c++0x -pedantic-errors" }
+
+int i;
+void f();
+typedef int T;
+
+int main()
+{
+  [i]{};			// { dg-error "non-automatic" }
+  [f]{};			// { dg-error "non-variable" }
+  [T]{};			// { dg-error "non-variable" }
+}
+
+struct A { };