/cp

2012-05-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/39681
	* parser.c (cp_parser_new_type_id): Early return error_mark_node
	if the cp_parser_type_specifier_seq call has type_specifier_seq.type
	error_mark_node; tidy.
	(cp_parser_new_expression): Always initialize nelts to NULL_TREE to
	avoid uninitialized warnings.
	(cp_parser_init_declarator, cp_parser_late_parse_one_default_arg):
	Call cp_parser_skip_to_end_of_statement if cp_parser_initializer
	returns error_mark_node.

/testsuite
2012-05-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/39681
	* g++.dg/parse/error48.C: New.
	* g++.dg/cpp0x/error8.C: Likewise.
	* g++.dg/ext/utf-cxx98.C: Adjust dg-error directive.
	* g++.dg/ext/utf-dflt2.C: Likewise.
	* g++.dg/ext/utf-gnuxx98.C: Likewise.
	* g++.dg/ext/utf-dflt.C: Likewise.
	* c-c++-common/raw-string-3.c: Likewise.
	* c-c++-common/raw-string-4.c: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187634 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 21 insertions, 21 deletions

diff --git a/gcc/testsuite/c-c++-common/raw-string-3.c b/gcc/testsuite/c-c++-common/raw-string-3.c
index df9e2755518..70d4145da0c 100644
--- a/gcc/testsuite/c-c++-common/raw-string-3.c
+++ b/gcc/testsuite/c-c++-common/raw-string-3.c
@@ -5,26 +5,26 @@
 // { dg-options "-std=c++98" { target c++ } }
 
 const void	*s0	= R"(a)";	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 7 }
+                // { dg-error "expected ',' or ';'" "" { target c } 7 }
 const void	*s1	= uR"(a)";	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 9 }
+                // { dg-error "expected ',' or ';'" "" { target c } 9 }
 const void	*s2	= UR"(a)";	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 11 }
+                // { dg-error "expected ',' or ';'" "" { target c } 11 }
 const void	*s3	= u8R"(a)";	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 13 }
+                // { dg-error "expected ',' or ';'" "" { target c } 13 }
 const void	*s4	= LR"(a)";	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 15 }
-
-const int	i0	= R'a';		// { dg-error "expected ',' or ';'" }
-		// { dg-error "was not declared" "" { target c++ } 18 }
-const int	i1	= uR'a';	// { dg-error "expected ',' or ';'" }
-		// { dg-error "was not declared" "" { target c++ } 20 }
-const int	i2	= UR'a';	// { dg-error "expected ',' or ';'" }
-		// { dg-error "was not declared" "" { target c++ } 22 }
-const int	i3	= u8R'a';	// { dg-error "expected ',' or ';'" }
-		// { dg-error "was not declared" "" { target c++ } 24 }
-const int	i4	= LR'a';	// { dg-error "expected ',' or ';'" }
-		// { dg-error "was not declared" "" { target c++ } 26 }
+                // { dg-error "expected ',' or ';'" "" { target c } 15 }
+
+const int	i0	= R'a';		// { dg-error "was not declared" "" { target c++ } }
+                // { dg-error "expected ',' or ';'" "" { target c } 18 }
+const int	i1	= uR'a';	// { dg-error "was not declared" "" { target c++ } }
+                // { dg-error "expected ',' or ';'" "" { target c } 20 }
+const int	i2	= UR'a';	// { dg-error "was not declared" "" { target c++ } }
+                // { dg-error "expected ',' or ';'" "" { target c } 22 }
+const int	i3	= u8R'a';	// { dg-error "was not declared" "" { target c++ } }
+                // { dg-error "expected ',' or ';'" "" { target c } 24 }
+const int	i4	= LR'a';	// { dg-error "was not declared" "" { target c++ } }
+                // { dg-error "expected ',' or ';'" "" { target c } 26 }
 
 #define R	"a"
 #define uR	"b"
diff --git a/gcc/testsuite/c-c++-common/raw-string-4.c b/gcc/testsuite/c-c++-common/raw-string-4.c
index 626e7f257ae..95825d7c9cf 100644
--- a/gcc/testsuite/c-c++-common/raw-string-4.c
+++ b/gcc/testsuite/c-c++-common/raw-string-4.c
@@ -4,15 +4,15 @@
 // { dg-options "-std=c++0x" { target c++ } }
 
 const int	i0	= R'a';	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 6 }
+		// { dg-error "expected ',' or ';'" "" { target c } 6 }
 const int	i1	= uR'a';	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 8 }
+		// { dg-error "expected ',' or ';'" "" { target c } 8 }
 const int	i2	= UR'a';	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 10 }
+		// { dg-error "expected ',' or ';'" "" { target c } 10 }
 const int	i3	= u8R'a';	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 12 }
+		// { dg-error "expected ',' or ';'" "" { target c } 12 }
 const int	i4	= LR'a';	// { dg-error "was not declared|undeclared" }
-		// { dg-error "expected ',' or ';'" "" { target *-*-* } 14 }
+		// { dg-error "expected ',' or ';'" "" { target c } 14 }
 
 #define R	1 +
 #define uR	2 +