re PR c++/51404 ([c++0x] [4.7 Regression] ICE with invalid use of auto)

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

From-SVN: r182011

gcc/cp/ChangeLog

+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.
+
 2011-12-03  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/51313

gcc/cp/parser.c

@@ -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);

gcc/cp/typeck2.c

@@ -1653,7 +1653,7 @@ build_functional_cast (tree exp, tree parms, tsubst_flags_t complain)
     {
       if (complain & tf_error)
 	error ("invalid use of %<auto%>");
-      type = error_mark_node;
+      return error_mark_node;
     }
 
   if (processing_template_decl)

gcc/testsuite/ChangeLog

+2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51404
+	* g++.dg/cpp0x/auto28.C: New.
+
 2011-12-05  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
 	* gcc.dg/torture/vec-cvt-1.c (FLTTEST): Call rand instead of random.

gcc/testsuite/g++.dg/cpp0x/auto28.C

+// PR c++/51404
+// { dg-options -std=c++0x }
+
+int i = auto().x;  // { dg-error "invalid use of" }