re PR c/68320 (internal compiler error: in declspecs_add_type)

	PR c/68320
	* c-parser.c (c_parser_for_statement): Treat unknown tokens as IDs.

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

From-SVN: r230322

4 files changed, 81 insertions, 4 deletions

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 9b1fdc9..8824f18 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-13  Marek Polacek  <polacek@redhat.com>
+
+	PR c/68320
+	* c-parser.c (c_parser_for_statement): Treat unknown tokens as IDs.
+
 2015-11-13  David Malcolm  <dmalcolm@redhat.com>
 
 	* c-typeck.c: Include spellcheck.h.
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index c01d651..82d5ce5 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -5757,12 +5757,12 @@ c_parser_for_statement (c_parser *parser, bool ivdep)
     {
       c_token *token = c_parser_peek_token (parser);
       tree decl = lookup_name (token->value);
-      if (decl == NULL_TREE)
-	;
+      if (decl == NULL_TREE || VAR_P (decl))
+	/* If DECL is null, we don't know what this token might be.  Treat
+	   it as an ID for better diagnostics; we'll error later on.  */
+	token->id_kind = C_ID_ID;
       else if (TREE_CODE (decl) == TYPE_DECL)
 	token->id_kind = C_ID_TYPENAME;
-      else if (VAR_P (decl))
-	token->id_kind = C_ID_ID;
     }
 
   token_indent_info next_tinfo
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 539b580..35e568c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-13  Marek Polacek  <polacek@redhat.com>
+
+	PR c/68320
+	* gcc.dg/pr68320.c: New test.
+
 2015-11-13  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* c-c++-common/goacc/data-default-1.c: Correct expected
diff --git a/gcc/testsuite/gcc.dg/pr68320.c b/gcc/testsuite/gcc.dg/pr68320.c
new file mode 100644
index 0000000..7060af8
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr68320.c
@@ -0,0 +1,67 @@
+/* PR c/68320 */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+void
+fn1 (void)
+{
+  for (typedef int T;;) /* { dg-error "declaration of non-variable" } */
+    if (1)
+      ;
+  T x; /* { dg-error "unknown type name" } */
+}
+
+void
+fn2 (int i)
+{
+  for (typedef int T;;) /* { dg-error "declaration of non-variable" } */
+    if (1)
+      i = 5;
+  T x; /* { dg-error "unknown type name" } */
+}
+
+void
+fn3 (void)
+{
+  for (typedef int T;;) /* { dg-error "declaration of non-variable" } */
+    if (1)
+      {
+      }
+  T *x; /* { dg-error "unknown type name" } */
+}
+
+void
+fn4 (void)
+{
+  for (typedef int T;;) /* { dg-error "declaration of non-variable" } */
+    if (1)
+      ;
+  T, T; /* { dg-error "undeclared" } */
+}
+
+void
+fn5 (void)
+{
+  for (typedef int T;;) /* { dg-error "declaration of non-variable" } */
+    if (1)
+      ;
+  T = 10; /* { dg-error "undeclared" } */
+}
+
+void
+fn6 (void)
+{
+  for (typedef int T;;) /* { dg-error "declaration of non-variable" } */
+    if (1)
+      ;
+  T[0]; /* { dg-error "undeclared" } */
+}
+
+void
+fn7 (void)
+{
+  for (typedef int T;;) /* { dg-error "declaration of non-variable" } */
+    if (1)
+      ;
+  T (); /* { dg-warning "implicit declaration" } */
+}