From 09cb9532c4c56979b1d9b105e5608ba22b66c5ac Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 18 Dec 2014 14:32:18 +0100 Subject: [PATCH] re PR tree-optimization/64330 (IPA-ICF merges const exported vars that could be addressable in other TUs) Fix for PR64330. PR tree-optimization/64330 * ipa-icf.c (sem_variable::parse): Add checking for externally visible symbols and do not introduce an alias for an external declaration. From-SVN: r218864 --- gcc/ChangeLog | 7 +++++++ gcc/ipa-icf.c | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7b85cbc751b..1bb69444717 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-12-18 Martin Liska + + PR tree-optimization/64330 + * ipa-icf.c (sem_variable::parse): Add checking + for externally visible symbols and do not introduce + an alias for an external declaration. + 2014-12-18 Jan Hubicka PR bootstrap/63573 diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index 91878b2d3fc..244edaa1bc4 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -1139,10 +1139,14 @@ sem_variable::parse (varpool_node *node, bitmap_obstack *stack) tree decl = node->decl; bool readonly = TYPE_P (decl) ? TYPE_READONLY (decl) : TREE_READONLY (decl); - bool can_handle = readonly && (DECL_VIRTUAL_P (decl) - || !TREE_ADDRESSABLE (decl)); + if (!readonly) + return NULL; + + bool can_handle = DECL_VIRTUAL_P (decl) + || flag_merge_constants >= 2 + || (!TREE_ADDRESSABLE (decl) && !node->externally_visible); - if (!can_handle) + if (!can_handle || DECL_EXTERNAL (decl)) return NULL; tree ctor = ctor_for_folding (decl); -- 2.30.2