From 72370368eb04a69bf36b42f692d44c21592bc94a Mon Sep 17 00:00:00 2001 From: mliska Date: Fri, 27 Feb 2015 23:44:32 +0100 Subject: [PATCH 3/4] ICF: Optimize variable merging. gcc/ChangeLog: 2015-02-28 Martin Liska Jan Hubicka * ipa-icf.c (sem_variable::parse): Do not filter variables too early. (sem_item_optimizer::filter_removed_items): Filter out correct readonly variables. gcc/testsuite/ChangeLog: 2015-02-28 Martin Liska Jan Hubicka * gcc.dg/ipa/ipa-icf-35.c: New test. --- gcc/ipa-icf.c | 13 ++++++++----- gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index 864a5d0..5b1fcff 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -1410,10 +1410,6 @@ sem_variable::parse (varpool_node *node, bitmap_obstack *stack) if (node->alias) return NULL; - bool readonly = TYPE_P (decl) ? TYPE_READONLY (decl) : TREE_READONLY (decl); - if (!readonly) - return NULL; - bool can_handle = DECL_VIRTUAL_P (decl) || flag_merge_constants >= 2 || (!TREE_ADDRESSABLE (decl) && !node->externally_visible); @@ -1900,7 +1896,14 @@ sem_item_optimizer::filter_removed_items (void) if (!flag_ipa_icf_variables) remove_item (item); else - filtered.safe_push (item); + { + /* Filter out non-readonly variables. */ + tree decl = item->decl; + if (TYPE_P (decl) ? TYPE_READONLY (decl) : TREE_READONLY (decl)) + filtered.safe_push (item); + else + remove_item (item); + } } } diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c new file mode 100644 index 0000000..95d247e --- /dev/null +++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c @@ -0,0 +1,34 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-ipa-icf" } */ + +#include +#include + +void f1() +{ +} + +void f2() +{ +} + +static void (*a)(void)=&f1; +static void (*b)(void)=&f1; +static void (*c)(void)=&f2; +static void (*d)(void)=&f2; + +int main() +{ + a(); + b(); + c(); + d(); + + return 0; +} + +/* { dg-final { scan-ipa-dump "Equal symbols: 3" "icf" } } */ +/* { dg-final { scan-ipa-dump "Semantic equality hit:f2->f1" "icf" } } */ +/* { dg-final { scan-ipa-dump "Semantic equality hit:d->c" "icf" } } */ +/* { dg-final { scan-ipa-dump "Semantic equality hit:b->a" "icf" } } */ +/* { dg-final { cleanup-ipa-dump "icf" } } */ -- 2.1.2