From 9374ef820b2e1b5410bfd9ccb4c2dbd023a369c6 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 5 Mar 2015 18:49:49 +0100 Subject: [PATCH] re PR ipa/65318 (wrong code at -Os and above on x86_64-linux-gnu) PR ipa/65318 * ipa-icf.c (sem_variable::equals): Compare variables types. * gcc.dg/ipa/pr65318.c: New test. From-SVN: r221221 --- gcc/ChangeLog | 5 +++++ gcc/ipa-icf.c | 5 +++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/ipa/pr65318.c | 18 ++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/ipa/pr65318.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 73a346a5f4a..f78091957da 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-03-05 Martin Liska + + PR ipa/65318 + * ipa-icf.c (sem_variable::equals): Compare variables types. + 2015-03-05 Alex Velenko * config/arm/arm.c (arm_function_in_section_p): Fix predicate to diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index c55a09f7281..a7f19d6fd8d 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -1501,6 +1501,11 @@ sem_variable::equals (sem_item *item, if (DECL_INITIAL (item->decl) == error_mark_node && in_lto_p) dyn_cast (item->node)->get_constructor (); + /* As seen in PR ipa/65303 we have to compare variables types. */ + if (!func_checker::compatible_types_p (TREE_TYPE (decl), + TREE_TYPE (item->decl))) + return return_false_with_msg ("variables types are different"); + ret = sem_variable::equals (DECL_INITIAL (decl), DECL_INITIAL (item->node->decl)); if (dump_file && (dump_flags & TDF_DETAILS)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4f853ee4ca9..09d42b3d851 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-03-05 Martin Liska + + PR ipa/65318 + * gcc.dg/ipa/pr65318.c: New test. + 2015-03-05 Marek Polacek * c-c++-common/ubsan/bounds-6.c: Use dg-do run. diff --git a/gcc/testsuite/gcc.dg/ipa/pr65318.c b/gcc/testsuite/gcc.dg/ipa/pr65318.c new file mode 100644 index 00000000000..f23b3a2c36f --- /dev/null +++ b/gcc/testsuite/gcc.dg/ipa/pr65318.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-ipa-icf-details" } */ + +static short a = 0; +short b = -1; +static unsigned short c = 0; + +int +main () +{ + if (a <= b) + return 1; + + return 0; +} + +/* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf" } } */ +/* { dg-final { cleanup-ipa-dump "icf" } } */ -- 2.30.2