procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Canonicalize names of attributes.

Browse source 
2017-08-07  Martin Liska  <mliska@suse.cz>

	* attribs.h (canonicalize_attr_name): New function.
	(cmp_attribs): Move from c-format.c and adjusted.
	(is_attribute_p): Moved from tree.h.
	* tree-inline.c: Add new includes.
	* tree.c (cmp_attrib_identifiers): Use cmp_attribs.
	(private_is_attribute_p): Remove.
	(private_lookup_attribute): Likewise.
	(private_lookup_attribute_by_prefix): Simplify.
	(remove_attribute): Use is_attribute_p.
	* tree.h: Remove removed declarations.
2017-08-07  Martin Liska  <mliska@suse.cz>

	* array-notation-common.c: Add new includes.
	* c-format.c( handle_format_attribute): Canonicalize a format
	function name.
	* c-lex.c (c_common_has_attribute): Canonicalize name of an
	attribute.
	* c-pretty-print.c: Add new include.
2017-08-07  Martin Liska  <mliska@suse.cz>

	* parser.c (cp_parser_gnu_attribute_list): Canonicalize name of an
	attribute.
	(cp_parser_std_attribute): Likewise.
	* tree.c: Add new include.
2017-08-07  Martin Liska  <mliska@suse.cz>

	* c-parser.c (c_parser_attributes): Canonicalize name of an
	attribute.
2017-08-07  Martin Liska  <mliska@suse.cz>

	* go-gcc.cc (Gcc_backend::function): Look up for no_split_stack
	and not __no_split_stack__.
2017-08-07  Martin Liska  <mliska@suse.cz>

	* g++.dg/cpp0x/pr65558.C: Update scanned pattern.
	* gcc.dg/parm-impl-decl-1.c: Likewise.
	* gcc.dg/parm-impl-decl-3.c: Likewise.
	* gcc.dg/Wattributes-5.c: New test.

From-SVN: r250911
This commit is contained in:
Martin Liska 2017-08-07 10:37:07 +02:00 • committed by Martin Liska
parent a5320f3ce2
commit 577eec5656
22 changed files with 141 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gcc/ChangeLog
View file

@ -1,3 +1,16 @@
2017-08-07 Martin Liska <mliska@suse.cz>
* attribs.h (canonicalize_attr_name): New function.
(cmp_attribs): Move from c-format.c and adjusted.
(is_attribute_p): Moved from tree.h.
* tree-inline.c: Add new includes.
* tree.c (cmp_attrib_identifiers): Use cmp_attribs.
(private_is_attribute_p): Remove.
(private_lookup_attribute): Likewise.
(private_lookup_attribute_by_prefix): Simplify.
(remove_attribute): Use is_attribute_p.
* tree.h: Remove removed declarations.
2017-08-07 Jakub Jelinek <jakub@redhat.com>
PR middle-end/81698

43
gcc/attribs.h
View file

@ -47,4 +47,47 @@ extern char *make_unique_name (tree, const char *, bool);
extern tree make_dispatcher_decl (const tree);
extern bool is_function_default_version (const tree);
/* For a given IDENTIFIER_NODE, strip leading and trailing '_' characters
so that we have a canonical form of attribute names. */
static inline tree
canonicalize_attr_name (tree attr_name)
{
const size_t l = IDENTIFIER_LENGTH (attr_name);
const char *s = IDENTIFIER_POINTER (attr_name);
if (l > 4 && s[0] == '_' && s[1] == '_' && s[l - 1] == '_' && s[l - 2] == '_')
return get_identifier_with_length (s + 2, l - 4);
return attr_name;
}
/* Compare attribute identifiers ATTR1 and ATTR2 with length ATTR1_LEN and
ATTR2_LEN. */
static inline bool
cmp_attribs (const char *attr1, size_t attr1_len,
const char *attr2, size_t attr2_len)
{
return attr1_len == attr2_len && strncmp (attr1, attr2, attr1_len) == 0;
}
/* Compare attribute identifiers ATTR1 and ATTR2. */
static inline bool
cmp_attribs (const char *attr1, const char *attr2)
{
return cmp_attribs (attr1, strlen (attr1), attr2, strlen (attr2));
}
/* Given an identifier node IDENT and a string ATTR_NAME, return true
if the identifier node is a valid attribute name for the string. */
static inline bool
is_attribute_p (const char *attr_name, const_tree ident)
{
return cmp_attribs (attr_name, strlen (attr_name),
IDENTIFIER_POINTER (ident), IDENTIFIER_LENGTH (ident));
}
#endif // GCC_ATTRIBS_H

9
gcc/c-family/ChangeLog
View file

@ -1,3 +1,12 @@
2017-08-07 Martin Liska <mliska@suse.cz>
* array-notation-common.c: Add new includes.
* c-format.c( handle_format_attribute): Canonicalize a format
function name.
* c-lex.c (c_common_has_attribute): Canonicalize name of an
attribute.
* c-pretty-print.c: Add new include.
2017-08-05 Eric Botcazou <ebotcazou@adacore.com>
* c-ada-spec.c (has_static_fields): Look only into variables.

2
gcc/c-family/array-notation-common.c
View file

@ -27,6 +27,8 @@ along with GCC; see the file COPYING3. If not see
#include "options.h"
#include "c-family/c-common.h"
#include "tree-iterator.h"
#include "stringpool.h"
#include "attribs.h"
/* Returns true if the function call in FNDECL is __sec_implicit_index. */

24
gcc/c-family/c-format.c
View file

@ -33,6 +33,7 @@ along with GCC; see the file COPYING3. If not see
#include "substring-locations.h"
#include "selftest.h"
#include "builtins.h"
#include "attribs.h"
/* Handle attributes associated with format checking. */
@ -67,7 +68,6 @@ static bool check_format_string (tree argument,
static bool get_constant (tree expr, unsigned HOST_WIDE_INT *value,
int validated_p);
static const char *convert_format_name_to_system_name (const char *attr_name);
static bool cmp_attribs (const char *tattr_name, const char *attr_name);
static int first_target_format_type;
static const char *format_name (int format_num);
@ -3976,24 +3976,6 @@ convert_format_name_to_system_name (const char *attr_name)
return attr_name;
}
/* Return true if TATTR_NAME and ATTR_NAME are the same format attribute,
counting "name" and "__name__" as the same, false otherwise. */
static bool
cmp_attribs (const char *tattr_name, const char *attr_name)
{
int alen = strlen (attr_name);
int slen = (tattr_name ? strlen (tattr_name) : 0);
if (alen > 4 && attr_name[0] == '_' && attr_name[1] == '_'
&& attr_name[alen - 1] == '_' && attr_name[alen - 2] == '_')
{
attr_name += 2;
alen -= 4;
}
if (alen != slen || strncmp (tattr_name, attr_name, alen) != 0)
return false;
return true;
}
/* Handle a "format" attribute; arguments as in
struct attribute_spec.handler. */
tree
@ -4022,6 +4004,10 @@ handle_format_attribute (tree *node, tree ARG_UNUSED (name), tree args,
}
#endif
/* Canonicalize name of format function. */
if (TREE_CODE (TREE_VALUE (args)) == IDENTIFIER_NODE)
TREE_VALUE (args) = canonicalize_attr_name (TREE_VALUE (args));
if (!decode_format_attr (args, &info, 0))
{
*no_add_attrs = true;

1
gcc/c-family/c-lex.c
View file

@ -316,6 +316,7 @@ c_common_has_attribute (cpp_reader *pfile)
{
attr_name = get_identifier ((const char *)
cpp_token_as_text (pfile, token));
attr_name = canonicalize_attr_name (attr_name);
if (c_dialect_cxx ())
{
int idx = 0;

1
gcc/c-family/c-pretty-print.c
View file

@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "c-pretty-print.h"
#include "diagnostic.h"
#include "stor-layout.h"
#include "stringpool.h"
#include "attribs.h"
#include "intl.h"
#include "tree-pretty-print.h"

5
gcc/c/ChangeLog
View file

@ -1,3 +1,8 @@
2017-08-07 Martin Liska <mliska@suse.cz>
* c-parser.c (c_parser_attributes): Canonicalize name of an
attribute.
2017-08-02 Marek Polacek <polacek@redhat.com>
PR c/81289

3
gcc/c/c-parser.c
View file

@ -4170,9 +4170,11 @@ c_parser_attributes (c_parser *parser)
attr_name = c_parser_attribute_any_word (parser);
if (attr_name == NULL)
break;
attr_name = canonicalize_attr_name (attr_name);
if (is_cilkplus_vector_p (attr_name))
{
c_token *v_token = c_parser_peek_token (parser);
v_token->value = canonicalize_attr_name (v_token->value);
c_parser_cilk_simd_fn_vector_attrs (parser, *v_token);
/* If the next token isn't a comma, we're done. */
if (!c_parser_next_token_is (parser, CPP_COMMA))
@ -4236,6 +4238,7 @@ c_parser_attributes (c_parser *parser)
release_tree_vector (expr_list);
}
}
attr = build_tree_list (attr_name, attr_args);
if (c_parser_next_token_is (parser, CPP_CLOSE_PAREN))
c_parser_consume_token (parser);

7
gcc/cp/ChangeLog
View file

@ -1,3 +1,10 @@
2017-08-07 Martin Liska <mliska@suse.cz>
* parser.c (cp_parser_gnu_attribute_list): Canonicalize name of an
attribute.
(cp_parser_std_attribute): Likewise.
* tree.c: Add new include.
2017-08-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/79790

6
gcc/cp/parser.c
View file

@ -24782,7 +24782,8 @@ cp_parser_gnu_attribute_list (cp_parser* parser)
parsed identifier. */
? ridpointers[(int) token->keyword]
: id_token->u.value;
identifier = canonicalize_attr_name (identifier);
attribute = build_tree_list (identifier, NULL_TREE);
/* Peek at the next token. */
@ -24928,6 +24929,8 @@ cp_parser_std_attribute (cp_parser *parser, tree attr_ns)
"expected an identifier for the attribute name");
return error_mark_node;
}
attr_id = canonicalize_attr_name (attr_id);
attribute = build_tree_list (build_tree_list (attr_ns, attr_id),
NULL_TREE);
token = cp_lexer_peek_token (parser->lexer);
@ -24937,6 +24940,7 @@ cp_parser_std_attribute (cp_parser *parser, tree attr_ns)
NULL_TREE);
else
{
attr_id = canonicalize_attr_name (attr_id);
attribute = build_tree_list (build_tree_list (NULL_TREE, attr_id),
NULL_TREE);
/* C++11 noreturn attribute is equivalent to GNU's. */

1
gcc/cp/tree.c
View file

@ -32,6 +32,7 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "convert.h"
#include "gimplify.h"
#include "stringpool.h"
#include "attribs.h"
#include "flags.h"

5
gcc/go/ChangeLog
View file

@ -1,3 +1,8 @@
2017-08-07 Martin Liska <mliska@suse.cz>
* go-gcc.cc (Gcc_backend::function): Look up for no_split_stack
and not __no_split_stack__.
2017-07-27 Tony Reix <tony.reix@atos.net>
* go-backend.c (go_write_export_data): Use EXCLUDE section for

2
gcc/go/go-gcc.cc
View file

@ -3046,7 +3046,7 @@ Gcc_backend::function(Btype* fntype, const std::string& name,
DECL_UNINLINABLE(decl) = 1;
if (disable_split_stack)
{
tree attr = get_identifier("__no_split_stack__");
tree attr = get_identifier ("no_split_stack");
DECL_ATTRIBUTES(decl) = tree_cons(attr, NULL_TREE, NULL_TREE);
}
if (in_unique_section)

7
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2017-08-07 Martin Liska <mliska@suse.cz>
* g++.dg/cpp0x/pr65558.C: Update scanned pattern.
* gcc.dg/parm-impl-decl-1.c: Likewise.
* gcc.dg/parm-impl-decl-3.c: Likewise.
* gcc.dg/Wattributes-5.c: New test.
2017-08-06 Andrew Pinski <apinski@cavium.com>
* gcc.target/aarch64/target_attr_10.c: Add -mcpu=generic.

2
gcc/testsuite/g++.dg/cpp0x/pr65558.C
View file

@ -2,6 +2,6 @@
// { dg-do compile { target c++11 } }
inline namespace
__attribute__((__abi_tag__)) // { dg-warning "ignoring .__abi_tag__. attribute on anonymous namespace" }
__attribute__((__abi_tag__)) // { dg-warning "ignoring .abi_tag. attribute on anonymous namespace" }
{
}

13
gcc/testsuite/gcc.dg/Wattributes-5.c Normal file
View file

@ -0,0 +1,13 @@
/* { dg-do compile } */
/* { dg-options -Wattributes } */
void __attribute__((_foobar)) foo() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((_xformat__)) foo2() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((xformat__)) foo3() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((__xformat)) foo4() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((_)) foo5() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((_)) foo6() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((__)) foo7() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((___)) foo8() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((____)) foo9() { } /* { dg-warning "attribute directive ignored" } */
void __attribute__((_____)) foo10() { } /* { dg-warning "attribute directive ignored" } */

2
gcc/testsuite/gcc.dg/parm-impl-decl-1.c
View file

@ -7,7 +7,7 @@
/* Implicit function declaration in attribute in definition (testcase
from bug). */
int
foo (int __attribute__ ((__mode__ (vector_size(8)))) i) /* { dg-warning "'__mode__' attribute ignored" } */
foo (int __attribute__ ((__mode__ (vector_size(8)))) i) /* { dg-warning "'mode' attribute ignored" } */
{
return (long long) i;
}

2
gcc/testsuite/gcc.dg/parm-impl-decl-3.c
View file

@ -4,7 +4,7 @@
/* { dg-options "-g -std=gnu89" } */
int
foo (int __attribute__ ((__mode__ (vector_size(8)))) i) /* { dg-warning "'__mode__' attribute ignored" } */
foo (int __attribute__ ((__mode__ (vector_size(8)))) i) /* { dg-warning "'mode' attribute ignored" } */
{
return (long long) i;
}

3
gcc/tree-inline.c
View file

@ -57,7 +57,8 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "builtins.h"
#include "tree-chkp.h"
#include "stringpool.h"
#include "attribs.h"
/* I'm not real happy about this, but we need to handle gimple and
non-gimple trees. */

104
gcc/tree.c
View file

@ -4946,9 +4946,8 @@ simple_cst_list_equal (const_tree l1, const_tree l2)
return l1 == l2;
}
/* Compare two identifier nodes representing attributes. Either one may
be in wrapped __ATTR__ form. Return true if they are the same, false
otherwise. */
/* Compare two identifier nodes representing attributes.
Return true if they are the same, false otherwise. */
static bool
cmp_attrib_identifiers (const_tree attr1, const_tree attr2)
@ -4961,34 +4960,8 @@ cmp_attrib_identifiers (const_tree attr1, const_tree attr2)
if (attr1 == attr2)
return true;
/* If they are not equal, they may still be one in the form
'text' while the other one is in the form '__text__'. TODO:
If we were storing attributes in normalized 'text' form, then
this could all go away and we could take full advantage of
the fact that we're comparing identifiers. :-) */
const size_t attr1_len = IDENTIFIER_LENGTH (attr1);
const size_t attr2_len = IDENTIFIER_LENGTH (attr2);
if (attr2_len == attr1_len + 4)
{
const char *p = IDENTIFIER_POINTER (attr2);
const char *q = IDENTIFIER_POINTER (attr1);
if (p[0] == '_' && p[1] == '_'
&& p[attr2_len - 2] == '_' && p[attr2_len - 1] == '_'
&& strncmp (q, p + 2, attr1_len) == 0)
return true;;
}
else if (attr2_len + 4 == attr1_len)
{
const char *p = IDENTIFIER_POINTER (attr2);
const char *q = IDENTIFIER_POINTER (attr1);
if (q[0] == '_' && q[1] == '_'
&& q[attr1_len - 2] == '_' && q[attr1_len - 1] == '_'
&& strncmp (q + 2, p, attr2_len) == 0)
return true;
}
return false;
return cmp_attribs (IDENTIFIER_POINTER (attr1), IDENTIFIER_LENGTH (attr1),
IDENTIFIER_POINTER (attr2), IDENTIFIER_LENGTH (attr2));
}
/* Compare two attributes for their value identity. Return true if the
@ -6051,32 +6024,6 @@ make_pass_ipa_free_lang_data (gcc::context *ctxt)
return new pass_ipa_free_lang_data (ctxt);
}
/* The backbone of is_attribute_p(). ATTR_LEN is the string length of
ATTR_NAME. Also used internally by remove_attribute(). */
bool
private_is_attribute_p (const char *attr_name, size_t attr_len, const_tree ident)
{
size_t ident_len = IDENTIFIER_LENGTH (ident);
if (ident_len == attr_len)
{
if (id_equal (ident, attr_name))
return true;
}
else if (ident_len == attr_len + 4)
{
/* There is the possibility that ATTR is 'text' and IDENT is
'__text__'. */
const char *p = IDENTIFIER_POINTER (ident);
if (p[0] == '_' && p[1] == '_'
&& p[ident_len - 2] == '_' && p[ident_len - 1] == '_'
&& strncmp (attr_name, p + 2, attr_len) == 0)
return true;
}
return false;
}
/* The backbone of lookup_attribute(). ATTR_LEN is the string length
of ATTR_NAME, and LIST is not NULL_TREE. */
tree
@ -6084,25 +6031,11 @@ private_lookup_attribute (const char *attr_name, size_t attr_len, tree list)
{
while (list)
{
size_t ident_len = IDENTIFIER_LENGTH (get_attribute_name (list));
if (ident_len == attr_len)
{
if (!strcmp (attr_name,
IDENTIFIER_POINTER (get_attribute_name (list))))
break;
}
/* TODO: If we made sure that attributes were stored in the
canonical form without '__...__' (ie, as in 'text' as opposed
to '__text__') then we could avoid the following case. */
else if (ident_len == attr_len + 4)
{
const char *p = IDENTIFIER_POINTER (get_attribute_name (list));
if (p[0] == '_' && p[1] == '_'
&& p[ident_len - 2] == '_' && p[ident_len - 1] == '_'
&& strncmp (attr_name, p + 2, attr_len) == 0)
break;
}
tree attr = get_attribute_name (list);
size_t ident_len = IDENTIFIER_LENGTH (attr);
if (cmp_attribs (attr_name, attr_len, IDENTIFIER_POINTER (attr),
ident_len))
break;
list = TREE_CHAIN (list);
}
@ -6111,8 +6044,7 @@ private_lookup_attribute (const char *attr_name, size_t attr_len, tree list)
/* Given an attribute name ATTR_NAME and a list of attributes LIST,
return a pointer to the attribute's list first element if the attribute
starts with ATTR_NAME. ATTR_NAME must be in the form 'text' (not
'__text__'). */
starts with ATTR_NAME. */
tree
private_lookup_attribute_by_prefix (const char *attr_name, size_t attr_len,
@ -6129,17 +6061,11 @@ private_lookup_attribute_by_prefix (const char *attr_name, size_t attr_len,
}
const char *p = IDENTIFIER_POINTER (get_attribute_name (list));
gcc_checking_assert (attr_len == 0 || p[0] != '_');
if (strncmp (attr_name, p, attr_len) == 0)
break;
/* TODO: If we made sure that attributes were stored in the
canonical form without '__...__' (ie, as in 'text' as opposed
to '__text__') then we could avoid the following case. */
if (p[0] == '_' && p[1] == '_' &&
strncmp (attr_name, p + 2, attr_len) == 0)
break;
list = TREE_CHAIN (list);
}
@ -6185,16 +6111,14 @@ tree
remove_attribute (const char *attr_name, tree list)
{
tree *p;
size_t attr_len = strlen (attr_name);
gcc_checking_assert (attr_name[0] != '_');
for (p = &list; *p; )
{
tree l = *p;
/* TODO: If we were storing attributes in normalized form, here
we could use a simple strcmp(). */
if (private_is_attribute_p (attr_name, attr_len, get_attribute_name (l)))
tree attr = get_attribute_name (l);
if (is_attribute_p (attr_name, attr))
*p = TREE_CHAIN (l);
else
p = &TREE_CHAIN (l);

23
gcc/tree.h
View file

@ -4195,29 +4195,8 @@ lookup_attribute_by_prefix (const char *attr_name, tree list)
list);
}
/* This function is a private implementation detail of
is_attribute_p() and you should never call it directly. */
extern bool private_is_attribute_p (const char *, size_t, const_tree);
/* Given an identifier node IDENT and a string ATTR_NAME, return true
if the identifier node is a valid attribute name for the string.
ATTR_NAME must be in the form 'text' (not '__text__'). IDENT could
be the identifier for 'text' or for '__text__'. */
static inline bool
is_attribute_p (const char *attr_name, const_tree ident)
{
gcc_checking_assert (attr_name[0] != '_');
/* Do the strlen() before calling the out-of-line implementation.
In most cases attr_name is a string constant, and the compiler
will optimize the strlen() away. */
return private_is_attribute_p (attr_name, strlen (attr_name), ident);
}
/* Remove any instances of attribute ATTR_NAME in LIST and return the
modified list. ATTR_NAME must be in the form 'text' (not
'__text__'). */
modified list. */
extern tree remove_attribute (const char *, tree);