re PR preprocessor/63831 (r217292 causes segfaults with -MM)

PR preprocessor/63831
	* c-cppbuiltin.c (c_cpp_builtins): Don't define __has_attribute
	and __has_cpp_attribute here.
	* c-ppoutput.c (init_pp_output): Set cb->has_attribute to
	c_common_has_attribute.
	* c-common.h (c_common_has_attribute): New prototype.
	* c-lex.c (init_c_lex): Set cb->has_attribute to
	c_common_has_attribute instead of cb_has_attribute.
	(get_token_no_padding): New function.
	(cb_has_attribute): Renamed to ...
	(c_common_has_attribute): ... this.  No longer static.  Use
	get_token_no_padding, require ()s, don't build TREE_LIST
	unnecessarily, fix up formatting, adjust diagnostics, call
	init_attributes.

	* directives.c (lex_macro_node): Remove __has_attribute__ handling.
	* internal.h (struct spec_node): Remove n__has_attribute__ field.
	(struct lexer_state): Remove in__has_attribute__ field.
	* macro.c (_cpp_builtin_macro_text): Handle BT_HAS_ATTRIBUTE.
	* identifiers.c (_cpp_init_hashtable): Remove __has_attribute__
	handling.
	* init.c (builtin_array): Add __has_attribute and __has_cpp_attribute.
	(cpp_init_special_builtins): Don't initialize __has_attribute
	or __has_cpp_attribute if CLK_ASM or pfile->cb.has_attribute is NULL.
	* traditional.c (enum ls): Remove ls_has_attribute,
	ls_has_attribute_close.
	(_cpp_scan_out_logical_line): Remove __has_attribute__ handling.
	* include/cpplib.h (enum cpp_builtin_type): Add BT_HAS_ATTRIBUTE.
	* pch.c (cpp_read_state): Remove __has_attribute__ handling.
	* expr.c (eval_token): Likewise.
	(parse_has_attribute): Removed.

	* c-c++-common/cpp/pr63831-1.c: New test.
	* c-c++-common/cpp/pr63831-2.c: New test.

From-SVN: r218948

gcc/c-family/ChangeLog

@@ -1,3 +1,20 @@
+2014-12-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR preprocessor/63831
+	* c-cppbuiltin.c (c_cpp_builtins): Don't define __has_attribute
+	and __has_cpp_attribute here.
+	* c-ppoutput.c (init_pp_output): Set cb->has_attribute to
+	c_common_has_attribute.
+	* c-common.h (c_common_has_attribute): New prototype.
+	* c-lex.c (init_c_lex): Set cb->has_attribute to
+	c_common_has_attribute instead of cb_has_attribute.
+	(get_token_no_padding): New function.
+	(cb_has_attribute): Renamed to ...
+	(c_common_has_attribute): ... this.  No longer static.  Use
+	get_token_no_padding, require ()s, don't build TREE_LIST
+	unnecessarily, fix up formatting, adjust diagnostics, call
+	init_attributes.
+
 2014-12-15  Jason Merrill  <jason@redhat.com>
 
 	* c.opt (-fsized-deallocation, -Wc++14-compat): New.

gcc/c-family/c-common.h

@@ -959,6 +959,7 @@ extern void c_cpp_builtins_optimize_pragma (cpp_reader *, tree, tree);
 extern bool c_cpp_error (cpp_reader *, int, int, location_t, unsigned int,
 			 const char *, va_list *)
      ATTRIBUTE_GCC_DIAG(6,0);
+extern int c_common_has_attribute (cpp_reader *);
 
 extern bool parse_optimize_options (tree, bool);
 

gcc/c-family/c-cppbuiltin.c

@@ -800,11 +800,6 @@ c_cpp_builtins (cpp_reader *pfile)
   cpp_define (pfile, "__has_include(STR)=__has_include__(STR)");
   cpp_define (pfile, "__has_include_next(STR)=__has_include_next__(STR)");
 
-  /* Set attribute test macros for all C/C++ (not for just C++11 etc.)
-     The builtin __has_attribute__ is defined in libcpp.  */
-  cpp_define (pfile, "__has_attribute(STR)=__has_attribute__(STR)");
-  cpp_define (pfile, "__has_cpp_attribute(STR)=__has_attribute__(STR)");
-
   if (c_dialect_cxx ())
     {
       if (flag_weak && SUPPORTS_ONE_ONLY)

gcc/c-family/c-lex.c

@@ -64,7 +64,6 @@ static void cb_ident (cpp_reader *, unsigned int, const cpp_string *);
 static void cb_def_pragma (cpp_reader *, unsigned int);
 static void cb_define (cpp_reader *, unsigned int, cpp_hashnode *);
 static void cb_undef (cpp_reader *, unsigned int, cpp_hashnode *);
-static int cb_has_attribute (cpp_reader *);
 
 void
 init_c_lex (void)
@@ -89,7 +88,7 @@ init_c_lex (void)
   cb->def_pragma = cb_def_pragma;
   cb->valid_pch = c_common_valid_pch;
   cb->read_pch = c_common_read_pch;
-  cb->has_attribute = cb_has_attribute;
+  cb->has_attribute = c_common_has_attribute;
 
   /* Set the debug callbacks if we can use them.  */
   if ((debug_info_level == DINFO_LEVEL_VERBOSE
@@ -288,57 +287,80 @@ cb_undef (cpp_reader * ARG_UNUSED (pfile), source_location loc,
 			 (const char *) NODE_NAME (node));
 }
 
+/* Wrapper around cpp_get_token to skip CPP_PADDING tokens
+   and not consume CPP_EOF.  */
+static const cpp_token *
+get_token_no_padding (cpp_reader *pfile)
+{
+  for (;;)
+    {
+      const cpp_token *ret = cpp_peek_token (pfile, 0);
+      if (ret->type == CPP_EOF)
+	return ret;
+      ret = cpp_get_token (pfile);
+      if (ret->type != CPP_PADDING)
+	return ret;
+    }
+}
+
 /* Callback for has_attribute.  */
-static int
+int
-cb_has_attribute (cpp_reader *pfile)
+c_common_has_attribute (cpp_reader *pfile)
 {
   int result = 0;
-  bool paren = false;
+  tree attr_name = NULL_TREE;
-  tree attr_ns = NULL_TREE, attr_id = NULL_TREE, attr_name = NULL_TREE;
   const cpp_token *token;
 
-  token = cpp_get_token (pfile);
+  token = get_token_no_padding (pfile);
-  if (token->type == CPP_OPEN_PAREN)
+  if (token->type != CPP_OPEN_PAREN)
     {
-      paren = true;
+      cpp_error (pfile, CPP_DL_ERROR,
-      token = cpp_get_token (pfile);
+		 "missing '(' after \"__has_attribute\"");
+      return 0;
     }
-
+  token = get_token_no_padding (pfile);
   if (token->type == CPP_NAME)
     {
-      //node = token->val.node.node;
+      attr_name = get_identifier ((const char *)
-      const cpp_token *nxt_token = cpp_peek_token (pfile, 0);
+				  cpp_token_as_text (pfile, token));
-      if (c_dialect_cxx() && nxt_token->type == CPP_SCOPE)
+      if (c_dialect_cxx ())
 	{
-	  nxt_token = cpp_get_token (pfile); // Eat scope.
+	  int idx = 0;
-	  nxt_token = cpp_get_token (pfile);
+	  const cpp_token *nxt_token;
+	  do
+	    nxt_token = cpp_peek_token (pfile, idx++);
+	  while (nxt_token->type == CPP_PADDING);
+	  if (nxt_token->type == CPP_SCOPE)
+	    {
+	      get_token_no_padding (pfile); // Eat scope.
+	      nxt_token = get_token_no_padding (pfile);
 	      if (nxt_token->type == CPP_NAME)
 		{
-	      attr_ns = get_identifier (
+		  tree attr_ns = attr_name;
-			(const char *) cpp_token_as_text (pfile, token));
+		  tree attr_id
-	      attr_id = get_identifier (
+		    = get_identifier ((const char *)
-			(const char *) cpp_token_as_text (pfile, nxt_token));
+				      cpp_token_as_text (pfile, nxt_token));
 		  attr_name = build_tree_list (attr_ns, attr_id);
 		}
-	  else
-	    cpp_error (pfile, CPP_DL_ERROR,
-		       "attribute identifier required after scope");
-	}
 	      else
 		{
-	  attr_ns = get_identifier ("gnu");
+		  cpp_error (pfile, CPP_DL_ERROR,
-	  attr_id = get_identifier (
+			     "attribute identifier required after scope");
-		    (const char *) cpp_token_as_text (pfile, token));
+		  attr_name = NULL_TREE;
-	  attr_name = build_tree_list (attr_ns, attr_id);
+		}
+	    }
 	}
       if (attr_name)
 	{
+	  init_attributes ();
 	  const struct attribute_spec *attr = lookup_attribute_spec (attr_name);
 	  if (attr)
 	    {
-	      if (is_attribute_p ("noreturn", TREE_VALUE (attr_name)))
+	      if (TREE_CODE (attr_name) == TREE_LIST)
+		attr_name = TREE_VALUE (attr_name);
+	      if (is_attribute_p ("noreturn", attr_name))
 		result = 200809;
-	      else if (is_attribute_p ("deprecated", TREE_VALUE (attr_name)))
+	      else if (is_attribute_p ("deprecated", attr_name))
 		result = 201309;
 	      else
 		result = 1;
@@ -346,16 +368,18 @@ cb_has_attribute (cpp_reader *pfile)
 	}
     }
   else
+    {
       cpp_error (pfile, CPP_DL_ERROR,
-	       "operator \"__has_attribute__\" requires an identifier");
+		 "macro \"__has_attribute\" requires an identifier");
+      return 0;
+    }
 
-  if (paren && cpp_get_token (pfile)->type != CPP_CLOSE_PAREN)
+  if (get_token_no_padding (pfile)->type != CPP_CLOSE_PAREN)
     cpp_error (pfile, CPP_DL_ERROR,
-	       "missing ')' after \"__has_attribute__\"");
+	       "missing ')' after \"__has_attribute\"");
 
   return result;
 }
-
 
 /* Read a token and return its type.  Fill *VALUE with its value, if
    applicable.  Fill *CPP_FLAGS with the token's flags, if it is

gcc/c-family/c-ppoutput.c

@@ -151,6 +151,8 @@ init_pp_output (FILE *out_stream)
       cb->used_undef = cb_used_undef;
     }
 
+  cb->has_attribute = c_common_has_attribute;
+
   /* Initialize the print structure.  */
   print.src_line = 1;
   print.printed = 0;

gcc/testsuite/ChangeLog

@@ -1,3 +1,9 @@
+2014-12-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR preprocessor/63831
+	* c-c++-common/cpp/pr63831-1.c: New test.
+	* c-c++-common/cpp/pr63831-2.c: New test.
+
 2014-12-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/63723

gcc/testsuite/c-c++-common/cpp/pr63831-1.c

@@ -0,0 +1,64 @@
+/* PR preprocessor/63831 */
+/* { dg-do compile } */
+
+#ifdef __has_attribute
+typedef char T1[__has_attribute (__noreturn__) == 200809 ? 1 : -1];
+typedef char T2[__has_attribute (alloc_size) == 1 ? 1 : -1];
+typedef char T3[__has_attribute (non_existent_attribuuuute) == 0 ? 1 : -1];
+#endif
+#if __has_attribute (noreturn) == 200809
+typedef char T4;
+#endif
+#define d deprecated
+typedef char T5[__has_attribute (d) == 201309 ? 1 : -1];
+T1 t1;
+T2 t2;
+T3 t3;
+T4 t4;
+T5 t5;
+#ifdef __cplusplus
+typedef char T6[__has_attribute (gnu::__noreturn__) == 200809 ? 1 : -1];
+typedef char T7[__has_attribute (gnu::alloc_size) == 1 ? 1 : -1];
+typedef char T8[__has_attribute (gnu::non_existent_attribuuuute) == 0 ? 1 : -1];
+#if __has_attribute (gnu::noreturn) == 200809
+typedef char T9;
+#endif
+#define d2 gnu::deprecated
+typedef char T10[__has_attribute (d) == 201309 ? 1 : -1];
+T6 t6;
+T7 t7;
+T8 t8;
+T9 t9;
+T10 t10;
+#endif
+#ifdef __has_cpp_attribute
+typedef char T11[__has_cpp_attribute (__noreturn__) == 200809 ? 1 : -1];
+typedef char T12[__has_cpp_attribute (alloc_size) == 1 ? 1 : -1];
+typedef char T13[__has_cpp_attribute (non_existent_attribuuuute) == 0 ? 1 : -1];
+#endif
+#if __has_cpp_attribute (noreturn) == 200809
+typedef char T14;
+#endif
+#define d deprecated
+typedef char T15[__has_cpp_attribute (d) == 201309 ? 1 : -1];
+T11 t11;
+T12 t12;
+T13 t13;
+T14 t14;
+T15 t15;
+#ifdef __cplusplus
+typedef char T16[__has_cpp_attribute (gnu::__noreturn__) == 200809 ? 1 : -1];
+typedef char T17[__has_cpp_attribute (gnu::alloc_size) == 1 ? 1 : -1];
+typedef char T18[__has_cpp_attribute (gnu::non_existent_attribuuuute) == 0 ? 1 : -1];
+#if __has_cpp_attribute (gnu::noreturn) == 200809
+typedef char T19;
+#endif
+#define d2 gnu::deprecated
+typedef char T20[__has_cpp_attribute (d) == 201309 ? 1 : -1];
+T16 t16;
+T17 t17;
+T18 t18;
+T19 t19;
+T20 t20;
+#endif
+int t21 = __has_attribute (noreturn) + __has_cpp_attribute (__malloc__);

gcc/testsuite/c-c++-common/cpp/pr63831-2.c

@@ -0,0 +1,7 @@
+/* PR preprocessor/63831 */
+/* { dg-do compile } */
+/* { dg-options "-save-temps" } */
+
+#include "pr63831-1.c"
+
+/* { dg-final { cleanup-saved-temps } } */

libcpp/ChangeLog

@@ -1,3 +1,23 @@
+2014-12-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR preprocessor/63831
+	* directives.c (lex_macro_node): Remove __has_attribute__ handling.
+	* internal.h (struct spec_node): Remove n__has_attribute__ field.
+	(struct lexer_state): Remove in__has_attribute__ field.
+	* macro.c (_cpp_builtin_macro_text): Handle BT_HAS_ATTRIBUTE.
+	* identifiers.c (_cpp_init_hashtable): Remove __has_attribute__
+	handling.
+	* init.c (builtin_array): Add __has_attribute and __has_cpp_attribute.
+	(cpp_init_special_builtins): Don't initialize __has_attribute
+	or __has_cpp_attribute if CLK_ASM or pfile->cb.has_attribute is NULL.
+	* traditional.c (enum ls): Remove ls_has_attribute,
+	ls_has_attribute_close.
+	(_cpp_scan_out_logical_line): Remove __has_attribute__ handling.
+	* include/cpplib.h (enum cpp_builtin_type): Add BT_HAS_ATTRIBUTE.
+	* pch.c (cpp_read_state): Remove __has_attribute__ handling.
+	* expr.c (eval_token): Likewise.
+	(parse_has_attribute): Removed.
+
 2014-12-11  Uros Bizjak  <ubizjak@gmail.com>
 
 	* directives.c (cpp_define_formatted): Use xvasprintf.

libcpp/directives.c

@@ -571,10 +571,6 @@ lex_macro_node (cpp_reader *pfile, bool is_def_or_undef)
 	     || node == pfile->spec_nodes.n__has_include_next__))
 	cpp_error (pfile, CPP_DL_ERROR,
 		   "\"__has_include__\" cannot be used as a macro name");
-      else if (is_def_or_undef
-	    && node == pfile->spec_nodes.n__has_attribute__)
-	cpp_error (pfile, CPP_DL_ERROR,
-		   "\"__has_attribute__\" cannot be used as a macro name");
       else if (! (node->flags & NODE_POISONED))
 	return node;
     }

libcpp/expr.c

@@ -65,7 +65,6 @@ static unsigned int interpret_int_suffix (cpp_reader *, const uchar *, size_t);
 static void check_promotion (cpp_reader *, const struct op *);
 
 static cpp_num parse_has_include (cpp_reader *, enum include_type);
-static cpp_num parse_has_attribute (cpp_reader *);
 
 /* Token type abuse to create unary plus and minus operators.  */
 #define CPP_UPLUS ((enum cpp_ttype) (CPP_LAST_CPP_OP + 1))
@@ -1055,8 +1054,6 @@ eval_token (cpp_reader *pfile, const cpp_token *token,
 	return parse_has_include (pfile, IT_INCLUDE);
       else if (token->val.node.node == pfile->spec_nodes.n__has_include_next__)
 	return parse_has_include (pfile, IT_INCLUDE_NEXT);
-      else if (token->val.node.node == pfile->spec_nodes.n__has_attribute__)
-	return parse_has_attribute (pfile);
       else if (CPP_OPTION (pfile, cplusplus)
 	       && (token->val.node.node == pfile->spec_nodes.n_true
 		   || token->val.node.node == pfile->spec_nodes.n_false))
@@ -2150,21 +2147,3 @@ parse_has_include (cpp_reader *pfile, enum include_type type)
 
   return result;
 }
-
-/* Handle meeting "__has_attribute__" in a preprocessor expression.  */
-static cpp_num
-parse_has_attribute (cpp_reader *pfile)
-{
-  pfile->state.in__has_attribute__++;
-
-  cpp_num result;
-  result.unsignedp = false;
-  result.high = 0;
-  result.overflow = false;
-
-  result.low = pfile->cb.has_attribute (pfile);
-
-  pfile->state.in__has_attribute__--;
-
-  return result;
-}

libcpp/identifiers.c

@@ -72,7 +72,6 @@ _cpp_init_hashtable (cpp_reader *pfile, cpp_hash_table *table)
   s->n__VA_ARGS__->flags |= NODE_DIAGNOSTIC;
   s->n__has_include__   = cpp_lookup (pfile, DSC("__has_include__"));
   s->n__has_include_next__ = cpp_lookup (pfile, DSC("__has_include_next__"));
-  s->n__has_attribute__   = cpp_lookup (pfile, DSC("__has_attribute__"));
 }
 
 /* Tear down the identifier hash table.  */

libcpp/include/cpplib.h

@@ -676,6 +676,7 @@ enum cpp_builtin_type
   BT_PRAGMA,			/* `_Pragma' operator */
   BT_TIMESTAMP,			/* `__TIMESTAMP__' */
   BT_COUNTER,			/* `__COUNTER__' */
+  BT_HAS_ATTRIBUTE,		/* `__has_attribute__(x)' */
   BT_FIRST_USER,		/* User defined builtin macros.  */
   BT_LAST_USER = BT_FIRST_USER + 31
 };

libcpp/init.c

@@ -380,6 +380,8 @@ static const struct builtin_macro builtin_array[] =
   B("__LINE__",		 BT_SPECLINE,      true),
   B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL, true),
   B("__COUNTER__",	 BT_COUNTER,       true),
+  B("__has_attribute",	 BT_HAS_ATTRIBUTE, true),
+  B("__has_cpp_attribute", BT_HAS_ATTRIBUTE, true),
   /* Keep builtins not used for -traditional-cpp at the end, and
      update init_builtins() if any more are added.  */
   B("_Pragma",		 BT_PRAGMA,        true),
@@ -460,6 +462,10 @@ cpp_init_special_builtins (cpp_reader *pfile)
 
   for (b = builtin_array; b < builtin_array + n; b++)
     {
+      if (b->value == BT_HAS_ATTRIBUTE
+	  && (CPP_OPTION (pfile, lang) == CLK_ASM
+	      || pfile->cb.has_attribute == NULL))
+	continue;
       cpp_hashnode *hp = cpp_lookup (pfile, b->name, b->len);
       hp->type = NT_MACRO;
       hp->flags |= NODE_BUILTIN;

libcpp/internal.h

@@ -261,9 +261,6 @@ struct lexer_state
   /* Nonzero if in a __has_include__ or __has_include_next__ statement.  */
   unsigned char in__has_include__;
 
-  /* Nonzero if in a __has_attribute__ statement.  */
-  unsigned char in__has_attribute__;
-
   /* Nonzero if prevent_expansion is true only because output is
      being discarded.  */
   unsigned char discarding_output;
@@ -287,7 +284,6 @@ struct spec_nodes
   cpp_hashnode *n__VA_ARGS__;		/* C99 vararg macros */
   cpp_hashnode *n__has_include__;	/* __has_include__ operator */
   cpp_hashnode *n__has_include_next__;	/* __has_include_next__ operator */
-  cpp_hashnode *n__has_attribute__;	/* __has_attribute__ operator */
 };
 
 typedef struct _cpp_line_note _cpp_line_note;

libcpp/macro.c

@@ -393,6 +393,10 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node)
 	    "__COUNTER__ expanded inside directive with -fdirectives-only");
       number = pfile->counter++;
       break;
+
+    case BT_HAS_ATTRIBUTE:
+      number = pfile->cb.has_attribute (pfile);
+      break;
     }
 
   if (result == NULL)

libcpp/pch.c

@@ -835,7 +835,6 @@ cpp_read_state (cpp_reader *r, const char *name, FILE *f,
     s->n__VA_ARGS__     = cpp_lookup (r, DSC("__VA_ARGS__"));
     s->n__has_include__ = cpp_lookup (r, DSC("__has_include__"));
     s->n__has_include_next__ = cpp_lookup (r, DSC("__has_include_next__"));
-    s->n__has_attribute__ = cpp_lookup (r, DSC("__has_attribute__"));
   }
 
   old_state = r->state;

libcpp/traditional.c

@@ -76,9 +76,7 @@ enum ls {ls_none = 0,		/* Normal state.  */
 	 ls_predicate,		/* After the predicate, maybe paren?  */
 	 ls_answer,		/* In answer to predicate.  */
 	 ls_has_include,	/* After __has_include__.  */
-	 ls_has_include_close,	/* Looking for ')' of __has_include__.  */
+	 ls_has_include_close};	/* Looking for ')' of __has_include__.  */
-	 ls_has_attribute,	/* After __has_attribute__.  */
-	 ls_has_attribute_close}; /* Looking for ')' of __has_attribute__.  */
 
 /* Lexing TODO: Maybe handle space in escaped newlines.  Stop lex.c
    from recognizing comments and directives during its lexing pass.  */
@@ -535,12 +533,6 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
 		  lex_state = ls_has_include;
 		  continue;
 		}
-	      else if (pfile->state.in_expression
-		       && node == pfile->spec_nodes.n__has_attribute__)
-		{
-		  lex_state = ls_has_attribute;
-		  continue;
-		}
 	    }
 	  break;
 
@@ -566,8 +558,6 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
 		lex_state = ls_defined_close;
 	      else if (lex_state == ls_has_include)
 		lex_state = ls_has_include_close;
-	      else if (lex_state == ls_has_attribute)
-		lex_state = ls_has_attribute_close;
 	    }
 	  break;
 
@@ -606,8 +596,7 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
 		    }
 		}
 	      else if (lex_state == ls_answer || lex_state == ls_defined_close
-			|| lex_state == ls_has_include_close
+			|| lex_state == ls_has_include_close)
-			|| lex_state == ls_has_attribute_close)
 		lex_state = ls_none;
 	    }
 	  break;
@@ -689,8 +678,7 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
       else if (lex_state == ls_hash
 	       || lex_state == ls_predicate
 	       || lex_state == ls_defined
-	       || lex_state == ls_has_include
+	       || lex_state == ls_has_include)
-	       || lex_state == ls_has_attribute)
 	lex_state = ls_none;
 
       /* ls_answer and ls_defined_close keep going until ')'.  */