summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/varpool.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91bb92fedbe..98e37104f62 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-14 Jan Hubicka <hubicka@ucw.cz>
+
+ PR lto/60820
+ * varpool.c (varpool_remove_node): Do not alter decls when streaming.
+
2014-04-14 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.c (examine_argument): Return bool. Return true if
diff --git a/gcc/varpool.c b/gcc/varpool.c
index acb522100ea..b5493ab5a84 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -166,7 +166,9 @@ varpool_remove_node (varpool_node *node)
/* Because we remove references from external functions before final compilation,
we may end up removing useful constructors.
FIXME: We probably want to trace boundaries better. */
- if ((init = ctor_for_folding (node->decl)) == error_mark_node)
+ if (cgraph_state == CGRAPH_LTO_STREAMING)
+ ;
+ else if ((init = ctor_for_folding (node->decl)) == error_mark_node)
varpool_remove_initializer (node);
else
DECL_INITIAL (node->decl) = init;