From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Wed, 17 Jan 2018 21:29:59 +0000 (+0000)
Subject: re PR c++/78344 (ICE on invalid c++ code on x86_64-linux-gnu (internal compiler error... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a533fc76359bf0dfedc15be83f0bfd886712a4b3;p=gcc.git

re PR c++/78344 (ICE on invalid c++ code on x86_64-linux-gnu (internal compiler error: tree check: expected tree_list, have error_mark in cp_check_const_attributes, at cp/decl2.c:1347))

/cp
2018-01-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/78344
	* decl.c (grokdeclarator): Do not append the error_mark_node
	due to an erroneous optional attribute-specifier-seq.

/testsuite
2018-01-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/78344
	* g++.dg/cpp0x/alignas13.C: New.

From-SVN: r256821
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0d73c5b0f4a..5978a649559 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/78344
+	* decl.c (grokdeclarator): Do not append the error_mark_node
+	due to an erroneous optional attribute-specifier-seq.
+
 2018-01-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/83897
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 148afa6c9ac..12022a2fdd8 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11491,9 +11491,15 @@ grokdeclarator (const cp_declarator *declarator,
       && declarator->kind == cdk_id
       && declarator->std_attributes
       && attrlist != NULL)
-    /* [dcl.meaning]/1: The optional attribute-specifier-seq following
-       a declarator-id appertains to the entity that is declared.  */
-    *attrlist = chainon (*attrlist, declarator->std_attributes);
+    {
+      /* [dcl.meaning]/1: The optional attribute-specifier-seq following
+	 a declarator-id appertains to the entity that is declared.  */
+      if (declarator->std_attributes != error_mark_node)
+	*attrlist = chainon (*attrlist, declarator->std_attributes);
+      else
+	/* We should have already diagnosed the issue (c++/78344).  */
+	gcc_assert (seen_error ());
+    }
 
   /* Handle parameter packs. */
   if (parameter_pack_p)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96495d9f7c6..364d044c721 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/78344
+	* g++.dg/cpp0x/alignas13.C: New.
+
 2018-01-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/83897
diff --git a/gcc/testsuite/g++.dg/cpp0x/alignas13.C b/gcc/testsuite/g++.dg/cpp0x/alignas13.C
new file mode 100644
index 00000000000..4811b03a5ef
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/alignas13.C
@@ -0,0 +1,5 @@
+// PR c++/78344
+// { dg-do compile { target c++11 } }
+
+alignas(double) int f alignas;         // { dg-error "30:expected '\\('" }
+alignas(double) int g alignas(double;  // { dg-error "37:expected '\\)'" }