diff mbox

[C++] PR 51404

Message ID 4EDCE4D3.3090800@oracle.com
State New
Headers show

Commit Message

Paolo Carlini Dec. 5, 2011, 3:35 p.m. UTC 
Hi,
> Hmm, I think giving the additional error was intentional, which is why 
> we check for error_operand_p after giving it.  But I suppose I'm not 
> attached to that.
>
> We could avoid reformatting by adding
>
> if (error_operand_p (bounds))
>   /* Already gave an error.  */;
>
> OK either way.
Thanks. Thus I'm going to apply the below.

By the way, something I didn't like about the simpler patch not tweaking 
cp_parser_direct_declarator is that we would handle inconsistently the 
two tests in auto25.C, producing the more verbose diagnostic only for 
the first one. A little more work would be needed.

Paolo.
/cp
2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51404
	* typeck2.c (build_functional_cast): Early return error_mark_node
	for invalid uses of 'auto'.
	* parser.c (cp_parser_direct_declarator): When
	cp_parser_constant_expression returns error do not produce further
	diagnostic for the bound.

/testsuite
2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51404
	* g++.dg/cpp0x/auto28.C: New.
diff mbox

Patch

Index: testsuite/g++.dg/cpp0x/auto28.C
===================================================================
--- testsuite/g++.dg/cpp0x/auto28.C	(revision 0)
+++ testsuite/g++.dg/cpp0x/auto28.C	(revision 0)
@@ -0,0 +1,4 @@ 
+// PR c++/51404
+// { dg-options -std=c++0x }
+
+int i = auto().x;  // { dg-error "invalid use of" }
Index: cp/typeck2.c
===================================================================
--- cp/typeck2.c	(revision 182007)
+++ cp/typeck2.c	(working copy)
@@ -1653,7 +1653,7 @@  build_functional_cast (tree exp, tree parms, tsubs
     {
       if (complain & tf_error)
 	error ("invalid use of %<auto%>");
-      type = error_mark_node;
+      return error_mark_node;
     }
 
   if (processing_template_decl)
Index: cp/parser.c
===================================================================
--- cp/parser.c	(revision 182007)
+++ cp/parser.c	(working copy)
@@ -16055,18 +16055,20 @@  cp_parser_direct_declarator (cp_parser* parser,
 						 &non_constant_p);
 	      if (!non_constant_p)
 		/* OK */;
-	      /* Normally, the array bound must be an integral constant
-		 expression.  However, as an extension, we allow VLAs
-		 in function scopes as long as they aren't part of a
-		 parameter declaration.  */
+	      else if (error_operand_p (bounds))
+		/* Already gave an error.  */;
 	      else if (!parser->in_function_body
 		       || current_binding_level->kind == sk_function_parms)
 		{
+		  /* Normally, the array bound must be an integral constant
+		     expression.  However, as an extension, we allow VLAs
+		     in function scopes as long as they aren't part of a
+		     parameter declaration.  */
 		  cp_parser_error (parser,
 				   "array bound is not an integer constant");
 		  bounds = error_mark_node;
 		}
-	      else if (processing_template_decl && !error_operand_p (bounds))
+	      else if (processing_template_decl)
 		{
 		  /* Remember this wasn't a constant-expression.  */
 		  bounds = build_nop (TREE_TYPE (bounds), bounds);