aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/ChangeLog17
-rw-r--r--gcc/c-family/c-common.h1
-rw-r--r--gcc/c-family/c-cppbuiltin.c5
-rw-r--r--gcc/c-family/c-lex.c102
-rw-r--r--gcc/c-family/c-ppoutput.c2
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/c-c++-common/cpp/pr63831-1.c64
-rw-r--r--gcc/testsuite/c-c++-common/cpp/pr63831-2.c7
8 files changed, 160 insertions, 44 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 2d0c2fe..94e6c34 100644
--- a/gcc/c-family/ChangeLog
+++ b/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.
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 658cef0..c7eebcf 100644
--- a/gcc/c-family/c-common.h
+++ b/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);
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index 2dfecb6..057776f 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/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)
diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index 357d137..f67e490 100644
--- a/gcc/c-family/c-lex.c
+++ b/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
-cb_has_attribute (cpp_reader *pfile)
+int
+c_common_has_attribute (cpp_reader *pfile)
{
int result = 0;
- bool paren = false;
- tree attr_ns = NULL_TREE, attr_id = NULL_TREE, attr_name = NULL_TREE;
+ tree attr_name = NULL_TREE;
const cpp_token *token;
- token = cpp_get_token (pfile);
- if (token->type == CPP_OPEN_PAREN)
+ token = get_token_no_padding (pfile);
+ if (token->type != CPP_OPEN_PAREN)
{
- paren = true;
- token = cpp_get_token (pfile);
+ cpp_error (pfile, CPP_DL_ERROR,
+ "missing '(' after \"__has_attribute\"");
+ return 0;
}
-
+ token = get_token_no_padding (pfile);
if (token->type == CPP_NAME)
{
- //node = token->val.node.node;
- const cpp_token *nxt_token = cpp_peek_token (pfile, 0);
- if (c_dialect_cxx() && nxt_token->type == CPP_SCOPE)
+ attr_name = get_identifier ((const char *)
+ cpp_token_as_text (pfile, token));
+ if (c_dialect_cxx ())
{
- nxt_token = cpp_get_token (pfile); // Eat scope.
- nxt_token = cpp_get_token (pfile);
- if (nxt_token->type == CPP_NAME)
+ int idx = 0;
+ 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)
{
- attr_ns = get_identifier (
- (const char *) cpp_token_as_text (pfile, token));
- attr_id = get_identifier (
- (const char *) cpp_token_as_text (pfile, nxt_token));
- attr_name = build_tree_list (attr_ns, attr_id);
+ get_token_no_padding (pfile); // Eat scope.
+ nxt_token = get_token_no_padding (pfile);
+ if (nxt_token->type == CPP_NAME)
+ {
+ tree attr_ns = attr_name;
+ tree attr_id
+ = get_identifier ((const char *)
+ 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");
+ attr_name = NULL_TREE;
+ }
}
- else
- cpp_error (pfile, CPP_DL_ERROR,
- "attribute identifier required after scope");
- }
- else
- {
- attr_ns = get_identifier ("gnu");
- attr_id = get_identifier (
- (const char *) cpp_token_as_text (pfile, token));
- 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");
+ {
+ cpp_error (pfile, CPP_DL_ERROR,
+ "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
diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c
index 0292d16..66fbd7e 100644
--- a/gcc/c-family/c-ppoutput.c
+++ b/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;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 87453b5..3501218 100644
--- a/gcc/testsuite/ChangeLog
+++ b/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
diff --git a/gcc/testsuite/c-c++-common/cpp/pr63831-1.c b/gcc/testsuite/c-c++-common/cpp/pr63831-1.c
new file mode 100644
index 0000000..c9e7756
--- /dev/null
+++ b/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__);
diff --git a/gcc/testsuite/c-c++-common/cpp/pr63831-2.c b/gcc/testsuite/c-c++-common/cpp/pr63831-2.c
new file mode 100644
index 0000000..cc87d1d
--- /dev/null
+++ b/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 } } */
generated by cgit v1.1 at 2025-05-31 03:55:43 +0000