diff mbox series

c++: Rename DECL_BUILTIN_P to DECL_UNDECLARED_BUILTIN_P

Message ID fad4fbd2-1a88-17b9-81ff-4addf6b26a71@acm.org
State New
Headers show
Series c++: Rename DECL_BUILTIN_P to DECL_UNDECLARED_BUILTIN_P | expand

Commit Message

Nathan Sidwell Oct. 7, 2020, 12:06 p.m. UTC 
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.


pushing to trunk

nathan
diff mbox series

Patch

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index c9ad75117ad..22700844fac 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -4035,8 +4035,9 @@  more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter)
 #define FNDECL_USED_AUTO(NODE) \
   TREE_LANG_FLAG_2 (FUNCTION_DECL_CHECK (NODE))
 
-/* True if NODE is a builtin decl.  */
-#define DECL_BUILTIN_P(NODE) \
+/* True if NODE is an undeclared builtin decl.  As soon as the user
+   declares it, the location will be updated.  */
+#define DECL_UNDECLARED_BUILTIN_P(NODE) \
   (DECL_SOURCE_LOCATION(NODE) == BUILTINS_LOCATION)
 
 /* True for artificial decls added for OpenMP privatized non-static
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index ac5fd92a162..ee9190d8d0c 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -1467,7 +1467,7 @@  duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden)
 
   /* Check for redeclaration and other discrepancies.  */
   if (TREE_CODE (olddecl) == FUNCTION_DECL
-      && DECL_BUILTIN_P (olddecl))
+      && DECL_UNDECLARED_BUILTIN_P (olddecl))
     {
       if (TREE_CODE (newdecl) != FUNCTION_DECL)
 	{
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 2f42ad0d532..5e714503e4b 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -2134,7 +2134,7 @@  anticipated_builtin_p (tree ovl)
 {
   return (TREE_CODE (ovl) == OVERLOAD
 	  && 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.
@@ -3987,7 +3987,7 @@  do_nonmember_using_decl (name_lookup &lookup, bool fn_scope_p,
 		}
 	      else if (old.using_p ())
 		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.  */
 	      else if (!matching_fn_p (new_fn, old_fn))
 		continue; /* Parameters do not match.  */
diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc
index 98174250585..e7ab325d7df 100644
--- a/libcc1/libcp1plugin.cc
+++ b/libcc1/libcp1plugin.cc
@@ -353,7 +353,7 @@  supplement_binding (cxx_binding *binding, tree decl)
 	   /* If TARGET_BVAL is anticipated but has not yet been
 	      declared, pretend it is not there at all.  */
 	   || (TREE_CODE (target_bval) == FUNCTION_DECL
-	       && DECL_BUILTIN_P (target_bval)))
+	       && DECL_UNDECLARED_BUILTIN_P (target_bval)))
     binding->value = decl;
   else if (TREE_CODE (target_bval) == TYPE_DECL
 	   && DECL_ARTIFICIAL (target_bval)