parser.c (cp_parser_constant_expression): Just return the non-constant expression.

	* parser.c (cp_parser_constant_expression): Just return the
	non-constant expression.

From-SVN: r174882

gcc/cp/ChangeLog

 2011-06-09  Jason Merrill  <jason@redhat.com>
 
+	* parser.c (cp_parser_constant_expression): Just return the
+	non-constant expression.
+
 	* semantics.c (finish_compound_literal): Set TREE_HAS_CONSTRUCTOR.
 
 2011-06-09  Paolo Carlini  <paolo.carlini@oracle.com>

gcc/cp/parser.c

@@ -7050,8 +7050,6 @@ cp_parser_constant_expression (cp_parser* parser,
     }
   if (allow_non_constant_p)
     *non_constant_p = parser->non_integral_constant_expression_p;
-  else if (parser->non_integral_constant_expression_p)
-    expression = error_mark_node;
   parser->non_integral_constant_expression_p
     = saved_non_integral_constant_expression_p;
 

gcc/testsuite/ChangeLog

+2011-06-09  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp0x/regress/error-recovery1.C: Adjust.
+	* g++.dg/parse/template7.C: Adjust.
+
 2011-06-09  Kaz Kojima  <kkojima@gcc.gnu.org>
 
 	PR target/49307

gcc/testsuite/g++.dg/cpp0x/regress/error-recovery1.C

@@ -7,3 +7,5 @@ foo ()
   const bool b =;		// { dg-error "" }
   foo < b > ();			// { dg-error "constant expression" }
 };
+
+// { dg-error "no match" "" { target *-*-* } 8 }

gcc/testsuite/g++.dg/parse/template7.C

@@ -2,4 +2,3 @@ template <int I>
 void f();			// { dg-message "note" }
 
 void g() { f<(3, 2)>(); } // { dg-error "" }
-// { dg-message "candidate" "candidate note" { target *-*-* } 4 }