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

c++: Rename DECL_BUILTIN_P to DECL_UNDECLARED_BUILTIN_P

Browse source 
I realized I'd misnamed DECL_BUILTIN_P, it's only true of compiler
builtins unless and until the user declares them -- at that point
they're real decls, and will have a location in the user's source.
(BUILT_IN_FN and friends still work though).  This renames them so
future-me is not confused as to why the predicate becomes false.

	gcc/cp/
	* cp-tree.h (DECL_BUILTIN_P): Rename to ...
	(DECL_UNDECLARED_BUILTIN_P): ... here.
	* decl.c (duplicate_decls): Adjust.
	* name-lookup.c (anticipated_builtin_p): Adjust.
	(do_nonmember_using_decl): Likewise.
	libcc1/
	* libcp1plugin.cc (supplement_binding): Rename
	DECL_BUILTIN_P.
This commit is contained in:
Nathan Sidwell 2020-10-07 05:02:34 -07:00
parent ba42c30445
commit 99e9b54313
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/cp-tree.h
View file

@ -4035,8 +4035,9 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter)
#define FNDECL_USED_AUTO(NODE) \ #define FNDECL_USED_AUTO(NODE) \
TREE_LANG_FLAG_2 (FUNCTION_DECL_CHECK (NODE)) TREE_LANG_FLAG_2 (FUNCTION_DECL_CHECK (NODE))
/* True if NODE is a builtin decl. */ /* True if NODE is an undeclared builtin decl. As soon as the user
#define DECL_BUILTIN_P(NODE) \ declares it, the location will be updated. */
#define DECL_UNDECLARED_BUILTIN_P(NODE) \
(DECL_SOURCE_LOCATION(NODE) == BUILTINS_LOCATION) (DECL_SOURCE_LOCATION(NODE) == BUILTINS_LOCATION)
/* True for artificial decls added for OpenMP privatized non-static /* True for artificial decls added for OpenMP privatized non-static

2
gcc/cp/decl.c
View file

@ -1467,7 +1467,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden)
/* Check for redeclaration and other discrepancies. */ /* Check for redeclaration and other discrepancies. */
if (TREE_CODE (olddecl) == FUNCTION_DECL if (TREE_CODE (olddecl) == FUNCTION_DECL
&& DECL_BUILTIN_P (olddecl)) && DECL_UNDECLARED_BUILTIN_P (olddecl))
{ {
if (TREE_CODE (newdecl) != FUNCTION_DECL) if (TREE_CODE (newdecl) != FUNCTION_DECL)
{ {

4
gcc/cp/name-lookup.c
View file

@ -2129,7 +2129,7 @@ anticipated_builtin_p (tree ovl)
{ {
return (TREE_CODE (ovl) == OVERLOAD return (TREE_CODE (ovl) == OVERLOAD
&& OVL_HIDDEN_P (ovl) && OVL_HIDDEN_P (ovl)
&& DECL_BUILTIN_P (OVL_FUNCTION (ovl))); && DECL_UNDECLARED_BUILTIN_P (OVL_FUNCTION (ovl)));
} }
/* BINDING records an existing declaration for a name in the current scope. /* BINDING records an existing declaration for a name in the current scope.
@ -3982,7 +3982,7 @@ do_nonmember_using_decl (name_lookup &lookup, bool fn_scope_p,
} }
else if (old.using_p ()) else if (old.using_p ())
continue; /* This is a using decl. */ continue; /* This is a using decl. */
else if (old.hidden_p () && DECL_BUILTIN_P (old_fn)) else if (old.hidden_p () && DECL_UNDECLARED_BUILTIN_P (old_fn))
continue; /* This is an anticipated builtin. */ continue; /* This is an anticipated builtin. */
else if (!matching_fn_p (new_fn, old_fn)) else if (!matching_fn_p (new_fn, old_fn))
continue; /* Parameters do not match. */ continue; /* Parameters do not match. */

2
libcc1/libcp1plugin.cc
View file

@ -353,7 +353,7 @@ supplement_binding (cxx_binding *binding, tree decl)
/* If TARGET_BVAL is anticipated but has not yet been /* If TARGET_BVAL is anticipated but has not yet been
declared, pretend it is not there at all. */ declared, pretend it is not there at all. */
|| (TREE_CODE (target_bval) == FUNCTION_DECL || (TREE_CODE (target_bval) == FUNCTION_DECL
&& DECL_BUILTIN_P (target_bval))) && DECL_UNDECLARED_BUILTIN_P (target_bval)))
binding->value = decl; binding->value = decl;
else if (TREE_CODE (target_bval) == TYPE_DECL else if (TREE_CODE (target_bval) == TYPE_DECL
&& DECL_ARTIFICIAL (target_bval) && DECL_ARTIFICIAL (target_bval)