aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Stump <mikestump@comcast.net>2010-02-20 17:28:14 +0000
committerMike Stump <mrs@gcc.gnu.org>2010-02-20 17:28:14 +0000
commitc387e0676eb6949dfc49681d6ac1b09c3e11d2ca (patch)
tree726f3c2083b55909bc072fa4afaf459f0c016422
parentf7172b55bb859fd27939374247df4cb0a24f03c0 (diff)
downloadgcc-c387e0676eb6949dfc49681d6ac1b09c3e11d2ca.zip
gcc-c387e0676eb6949dfc49681d6ac1b09c3e11d2ca.tar.gz
gcc-c387e0676eb6949dfc49681d6ac1b09c3e11d2ca.tar.bz2
re PR c/43125 (Revision 156907 failed gcc.dg/attr-used.c)
PR middle-end/43125 * c-decl.c (merge_decls): Merge DECL_PRESERVE_P. From-SVN: r156927
-rw-r--r--gcc/ChangeLog3
-rw-r--r--gcc/c-decl.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4ab4c0d..aa2d0fa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -37,6 +37,9 @@
2010-02-19 Mike Stump <mikestump@comcast.net>
+ PR middle-end/43125
+ * c-decl.c (merge_decls): Merge DECL_PRESERVE_P.
+
PR objc/43061
* cgraphunit.c (process_function_and_variable_attributes): Check
DECL_PRESERVE_P instead of looking up attribute "used".
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index e48cdc8..e8e7a45 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -2387,6 +2387,10 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
TREE_USED (newdecl) = 1;
else if (TREE_USED (newdecl))
TREE_USED (olddecl) = 1;
+ if (DECL_PRESERVE_P (olddecl))
+ DECL_PRESERVE_P (newdecl) = 1;
+ else if (DECL_PRESERVE_P (newdecl))
+ DECL_PRESERVE_P (olddecl) = 1;
/* Copy most of the decl-specific fields of NEWDECL into OLDDECL.
But preserve OLDDECL's DECL_UID, DECL_CONTEXT and