From: Roger Sayle <roger@eyesopen.com>
Date: Tue, 18 Mar 2003 04:31:21 +0000 (+0000)
Subject: decl.c (duplicate_decls): Use the new type when prototyping anticipated decls, even... 
X-Git-Tag: releases/gcc-3.4.0~7840
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10326855ab6f03a63a891d80f578c34104b18e22;p=thirdparty%2Fgcc.git

decl.c (duplicate_decls): Use the new type when prototyping anticipated decls, even when the types match.


	* decl.c (duplicate_decls): Use the new type when prototyping
	anticipated decls, even when the types match.  This defines the
	exception list for the built-in function.

From-SVN: r64522
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d6efa61c6e10..25cc235962cc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-17  Roger Sayle  <roger@eyesopen.com>
+
+	* decl.c (duplicate_decls): Use the new type when prototyping
+	anticipated decls, even when the types match.  This defines the
+	exception list for the built-in function.
+
 2003-03-17  Jason Merrill  <jason@redhat.com>
 
 	PR c++/10091
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index e00a5f32e38b..a0dba2fab133 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3072,6 +3072,10 @@ duplicate_decls (tree newdecl, tree olddecl)
 	  /* Replace the old RTL to avoid problems with inlining.  */
 	  SET_DECL_RTL (olddecl, DECL_RTL (newdecl));
 	}
+      /* Even if the types match, prefer the new declarations type
+	 for anitipated built-ins, for exception lists, etc...  */
+      else if (DECL_ANTICIPATED (olddecl))
+	TREE_TYPE (olddecl) = TREE_TYPE (newdecl);
 
       if (DECL_THIS_STATIC (newdecl) && !DECL_THIS_STATIC (olddecl))
 	{