re PR debug/66691 (ICE on valid code at -O3 with -g enabled in simplify_subreg, at...

[gcc.git] / gcc / gengtype-parse.c

diff --git a/gcc/gengtype-parse.c b/gcc/gengtype-parse.c
index 0f11cec7c413c5eb030434cd99f6c87c3dc31243..13b2b5c715ba942a47926fae5fc9529e5e706ac4 100644 (file)
--- a/gcc/gengtype-parse.c
+++ b/gcc/gengtype-parse.c
@@ -1,5 +1,5 @@
 /* Process source files and output type information.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -17,10 +17,11 @@
    along with GCC; see the file COPYING3.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#ifdef GENERATOR_FILE
-#include "bconfig.h"
-#else
+#ifdef HOST_GENERATOR_FILE
 #include "config.h"
+#define GENERATOR_FILE 1
+#else
+#include "bconfig.h"
 #endif
 #include "system.h"
 #include "gengtype.h"
@@ -273,17 +274,13 @@ require_template_declaration (const char *tmpl_name)
          str = concat (str, "enum ", (char *) 0);
          continue;
        }
-      if (token () == NUM)
+      if (token () == NUM
+         || token () == ':'
+         || token () == '+')
        {
          str = concat (str, advance (), (char *) 0);
          continue;
        }
-      if (token () == ':')
-       {
-         advance ();
-         str = concat (str, ":", (char *) 0);
-         continue;
-       }
       if (token () == '<')
        {
          advance ();
@@ -537,7 +534,6 @@ nestedptr_optvalue (options_p prev)
 /* One GTY(()) option:
    ID str_optvalue_opt
    | PTR_ALIAS type_optvalue
-   | PARAM_IS type_optvalue
    | NESTED_PTR nestedptr_optvalue
 */
 static options_p
@@ -552,9 +548,6 @@ option (options_p prev)
       advance ();
       return type_optvalue (prev, "ptr_alias");
 
-    case PARAM_IS:
-      return type_optvalue (prev, advance ());
-
     case NESTED_PTR:
       advance ();
       return nestedptr_optvalue (prev);