summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>2003-03-18 04:31:21 +0000
committersayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>2003-03-18 04:31:21 +0000
commit88d394b36e25664e03dfd213ad5f3fb0abb2837f (patch)
treebc60597044d1f306dc4da90b08864e102c3f194d
parentdbdac1869526db03e101305cb26636e4afb382e3 (diff)
downloadppe42-gcc-88d394b36e25664e03dfd213ad5f3fb0abb2837f.tar.gz
ppe42-gcc-88d394b36e25664e03dfd213ad5f3fb0abb2837f.zip
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64522 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/decl.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d6efa61c6e1..25cc235962c 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 e00a5f32e38..a0dba2fab13 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))
{
OpenPOWER on IntegriCloud