re PR c/65228 (ICE: expected tree that contains ‘decl minimal’ structure, have ‘error...

	PR c/65228
	* c-decl.c (start_decl): Return NULL_TREE if decl is an error node.

	* gcc.dg/pr65228.c: New test.

From-SVN: r221057

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 00c54492d6a7179eb5f3c09d42704d98f49da0c4..0fc999caaee2b9002e3aa9b96867fc9b6f1c08dd 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-27  Marek Polacek  <polacek@redhat.com>
+
+       Backported from mainline
+       2015-02-27  Marek Polacek  <polacek@redhat.com>
+
+       PR c/65228
+       * c-decl.c (start_decl): Return NULL_TREE if decl is an error node.
+
 2015-02-11  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/64824

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 47907d5ec7fc737999a69157b99c267e32a76ebc..df88edb84702b332668558cf20d431035a4322ad 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -4067,8 +4067,8 @@ start_decl (struct c_declarator *declarator, struct c_declspecs *declspecs,
   decl = grokdeclarator (declarator, declspecs,
                         NORMAL, initialized, NULL, &attributes, &expr, NULL,
                         deprecated_state);
-  if (!decl)
-    return 0;
+  if (!decl || decl == error_mark_node)
+    return NULL_TREE;
 
   if (expr)
     add_stmt (fold_convert (void_type_node, expr));

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a5924b312ed92ffced1cfa2c432e5c827c1c7e7..bb0f9cf8a1ac3601f590d3b9f0193274d798a7c9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-27  Marek Polacek  <polacek@redhat.com>
+
+       Backported from mainline
+       2015-02-27  Marek Polacek  <polacek@redhat.com>
+
+       PR c/65228
+       * gcc.dg/pr65228.c: New test.
+
 2015-02-27  Richard Biener  <rguenther@suse.de>
 
        PR lto/65193

diff --git a/gcc/testsuite/gcc.dg/pr65228.c b/gcc/testsuite/gcc.dg/pr65228.c
new file mode 100644 (file)
index 0000000..fd83238
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr65228.c
@@ -0,0 +1,11 @@
+/* PR c/65228 */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+__auto_type a = b; /* { dg-error "undeclared" } */
+
+void
+f (void)
+{
+  __auto_type c = d; /* { dg-error "undeclared" } */
+}