From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 30 May 2017 07:55:06 +0000 (+0200)
Subject: backport: re PR c++/78341 (ICE on invalid C++ code on x86_64-linux-gnu  (internal... 
X-Git-Tag: releases/gcc-5.5.0~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bced80a1c193070129da5a73f031d328bdc30032;p=thirdparty%2Fgcc.git

backport: re PR c++/78341 (ICE on invalid C++ code on x86_64-linux-gnu  (internal compiler error: in cp_parser_std_attribute_spec, at cp/parser.c:24597))

	Backported from mainline
	2017-01-11  Jakub Jelinek  <jakub@redhat.com>

	PR c++/78341
	* parser.c (cp_parser_std_attribute_spec): Remove over-eager
	assertion.  Formatting fix.

	* g++.dg/cpp0x/pr78341.C: New test.

From-SVN: r248639
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 52a1d0e5b906..fcc94ab31615 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,12 @@
 2017-05-30  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2017-01-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/78341
+	* parser.c (cp_parser_std_attribute_spec): Remove over-eager
+	assertion.  Formatting fix.
+
 	2017-01-04  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/78949
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 0ff5cf1dc4b5..82b970412402 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -22610,11 +22610,7 @@ cp_parser_std_attribute_spec (cp_parser *parser)
 
       if (!cp_parser_parse_definitely (parser))
 	{
-	  gcc_assert (alignas_expr == error_mark_node
-		      || alignas_expr == NULL_TREE);
-
-	  alignas_expr =
-	    cp_parser_assignment_expression (parser);
+	  alignas_expr = cp_parser_assignment_expression (parser);
 	  if (alignas_expr == error_mark_node)
 	    cp_parser_skip_to_end_of_statement (parser);
 	  if (alignas_expr == NULL_TREE
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6015fe17c121..4bc3ba0ca8d6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
 	Backported from mainline
 	2017-01-11  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/78341
+	* g++.dg/cpp0x/pr78341.C: New test.
+
 	PR middle-end/50199
 	* gcc.dg/lto/pr50199_0.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr78341.C b/gcc/testsuite/g++.dg/cpp0x/pr78341.C
new file mode 100644
index 000000000000..af9063840982
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr78341.C
@@ -0,0 +1,4 @@
+// PR c++/78341
+// { dg-do compile { target c++11 } }
+
+alignas (alignas double // { dg-error "" }