From fa60eeb9706dc937fc565b4c6d7fe7efad36c733 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 20 Oct 2015 20:46:45 +0000 Subject: [PATCH] array-notation-common.c (is_cilkplus_vector_p): Define. * array-notation-common.c (is_cilkplus_vector_p): Define. * c-common.h (is_cilkplus_vector_p): Declare. * c-parser.c (is_cilkplus_vector_p): Don't define here. * parser.c (is_cilkplus_vector_p): Don't define here. From-SVN: r229099 --- gcc/c-family/ChangeLog | 5 +++++ gcc/c-family/array-notation-common.c | 9 +++++++++ gcc/c-family/c-common.h | 1 + gcc/c/ChangeLog | 4 ++++ gcc/c/c-parser.c | 11 ----------- gcc/cp/ChangeLog | 4 ++++ gcc/cp/parser.c | 11 ----------- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index f6f5e7c5c25..46fb924e501 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2015-10-20 Marek Polacek + + * array-notation-common.c (is_cilkplus_vector_p): Define. + * c-common.h (is_cilkplus_vector_p): Declare. + 2015-10-20 Marek Polacek * c.opt (std=gnu++11): Do not describe as experimental. diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c index 85ded8d6b7c..6b55747b7d6 100644 --- a/gcc/c-family/array-notation-common.c +++ b/gcc/c-family/array-notation-common.c @@ -676,3 +676,12 @@ fix_sec_implicit_args (location_t loc, vec *list, vec_safe_push (array_operand, (*list)[ii]); return array_operand; } + +/* Returns true if NAME is an IDENTIFIER_NODE with identifier "vector", + "__vector", or "__vector__". */ + +bool +is_cilkplus_vector_p (tree name) +{ + return flag_cilkplus && is_attribute_p ("vector", name); +} diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h index cf4448230d9..4b5cac85446 100644 --- a/gcc/c-family/c-common.h +++ b/gcc/c-family/c-common.h @@ -1435,6 +1435,7 @@ extern void cilkplus_extract_an_triplets (vec *, size_t, size_t, vec > *); extern vec *fix_sec_implicit_args (location_t, vec *, vec, size_t, tree); +extern bool is_cilkplus_vector_p (tree); /* In cilk.c. */ extern tree insert_cilk_frame (tree); diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 2a083c40d80..c1dbde6f2d9 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,7 @@ +2015-10-20 Marek Polacek + + * c-parser.c (is_cilkplus_vector_p): Don't define here. + 2015-10-20 Marek Polacek PR c/67964 diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index e7b84400b5a..c8c6a2dff90 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -3848,17 +3848,6 @@ c_parser_attribute_any_word (c_parser *parser) return attr_name; } -/* Returns true of NAME is an IDENTIFIER_NODE with identiifer "vector," - "__vector" or "__vector__." */ - -static inline bool -is_cilkplus_vector_p (tree name) -{ - if (flag_cilkplus && is_attribute_p ("vector", name)) - return true; - return false; -} - #define CILK_SIMD_FN_CLAUSE_MASK \ ((OMP_CLAUSE_MASK_1 << PRAGMA_CILK_CLAUSE_VECTORLENGTH) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_CILK_CLAUSE_LINEAR) \ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6ffa733c0ac..63bb46f7e74 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2015-10-20 Marek Polacek + + * parser.c (is_cilkplus_vector_p): Don't define here. + 2015-10-19 Jason Merrill PR c++/67064 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index f07a5e49532..cfe5468a8b5 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -23225,17 +23225,6 @@ cp_parser_gnu_attributes_opt (cp_parser* parser) return attributes; } -/* Returns true of NAME is an IDENTIFIER_NODE with identiifer "vector," - "__vector" or "__vector__." */ - -static inline bool -is_cilkplus_vector_p (tree name) -{ - if (flag_cilkplus && is_attribute_p ("vector", name)) - return true; - return false; -} - /* Parse a GNU attribute-list. attribute-list: -- 2.30.2