From 04a9d0805e2480b9a7579bd30d389cbd2fee784a Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Mon, 1 Apr 2002 16:32:59 +0000 Subject: [PATCH] re PR c++/5998 (regression, all builtins disabled) PR c++/5998: * decl.c (duplicate_decls): Overwrite the RTL when (and only when) overwriting a built-in function. Don't use COPY_DECL_RTL, but follow the SET_DECL_RTL idiom used elsewhere in the function. From-SVN: r51690 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/decl.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 024176e8e4f..6f5c203e6de 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2002-04-01 Roger Sayle + + PR c++/5998: + * decl.c (duplicate_decls): Overwrite the RTL when (and only + when) overwriting a built-in function. Don't use COPY_DECL_RTL, + but follow the SET_DECL_RTL idiom used elsewhere in the function. + 2002-04-01 Neil Booth * cp-lang.c (LANG_HOOKS_SIGNED_TYPE, LANG_HOOKS_UNSIGNED_TYPE, diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e708a6de197..5ac75fcf615 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3202,6 +3202,9 @@ duplicate_decls (newdecl, olddecl) else /* Discard the old built-in function. */ return 0; + + /* Replace the old RTL to avoid problems with inlining. */ + SET_DECL_RTL (olddecl, DECL_RTL (newdecl)); } if (DECL_THIS_STATIC (newdecl) && !DECL_THIS_STATIC (olddecl)) @@ -3623,7 +3626,6 @@ duplicate_decls (newdecl, olddecl) TREE_READONLY (olddecl) = TREE_READONLY (newdecl); TREE_THIS_VOLATILE (olddecl) = TREE_THIS_VOLATILE (newdecl); TREE_SIDE_EFFECTS (olddecl) = TREE_SIDE_EFFECTS (newdecl); - COPY_DECL_RTL (newdecl, olddecl); } /* Merge the storage class information. */