From: Roger Sayle <roger@eyesopen.com>
Date: Mon, 1 Apr 2002 16:32:59 +0000 (+0000)
Subject: re PR c++/5998 (regression, all builtins disabled)
X-Git-Tag: releases/gcc-3.3.0~5976
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04a9d0805e2480b9a7579bd30d389cbd2fee784a;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 024176e8e4fa..6f5c203e6de3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-01  Roger Sayle  <roger@eyesopen.com>
+
+	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  <neil@daikokuya.demon.co.uk>
 
 	* cp-lang.c (LANG_HOOKS_SIGNED_TYPE, LANG_HOOKS_UNSIGNED_TYPE,
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index e708a6de1979..5ac75fcf615c 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.  */