* decl.c (duplicate_decls): Use DECL_IS_BUILTIN rather than test

	DECL_SOURCE_LOCATION directly.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160806 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 07d565d..ce7d085 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-15  Jason Merrill  <jason@redhat.com>
 
+       * decl.c (duplicate_decls): Use DECL_IS_BUILTIN rather than test
+       DECL_SOURCE_LOCATION directly.
+
        * class.c (type_has_user_provided_default_constructor): Use
        sufficient_parms_p.
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 3108f9d..9541252 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -1295,7 +1295,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
       /* Even if the types match, prefer the new declarations type for
         built-ins which have not been explicitly declared, for
         exception lists, etc...  */
-      else if (DECL_SOURCE_LOCATION (olddecl) == BUILTINS_LOCATION)
+      else if (DECL_IS_BUILTIN (olddecl))
        {
          tree type = TREE_TYPE (newdecl);
          tree attribs = (*targetm.merge_type_attributes)