backport: re PR c++/78341 (ICE on invalid C++ code on x86_64-linux-gnu (internal...

	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 52a1d0e5b906c3cf52c9a327d2044fe34ea8bad3..fcc94ab316159434ba1254a80ae34fc30b504e85 100644 (file)
--- 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 0ff5cf1dc4b53bfc69c5f150c67a04f9703204b5..82b9704124026bcef833f7d6a037be60ee5ac2d8 100644 (file)
--- 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 6015fe17c121d534540856acd0239b8856df6a98..4bc3ba0ca8d6a6857db3d5d11b4d96a57a20a8b6 100644 (file)
--- 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 (file)
index 0000000..af90638
--- /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 "" }