From d4f4e71c84fc7bcf21f45e315a07b1408f514f75 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 10 Dec 2015 09:05:58 +0000 Subject: [PATCH] re PR ipa/68721 (wrong code at -Os and above on x86_64-linux-gnu) 2015-12-10 Richard Biener PR ipa/68721 * ipa-split.c (split_function): Record return value properly when the split part doesn't set it. * gcc.dg/torture/pr68721.c: New testcase. From-SVN: r231494 --- gcc/ChangeLog | 6 +++++ gcc/ipa-split.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr68721.c | 31 ++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr68721.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c990fc3fc66..b5ee0be9a53 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-12-10 Richard Biener + + PR ipa/68721 + * ipa-split.c (split_function): Record return value properly + when the split part doesn't set it. + 2015-12-10 Richard Biener PR tree-optimization/68806 diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c index 56c954b01b2..f77ab52161d 100644 --- a/gcc/ipa-split.c +++ b/gcc/ipa-split.c @@ -1281,7 +1281,7 @@ split_function (basic_block return_bb, struct split_point *split_point, to return void instead of just outputting function with undefined return value. For structures this affects quality of codegen. */ else if (!split_point->split_part_set_retval - && find_retval (return_bb)) + && (retval = find_retval (return_bb))) { bool redirected = true; basic_block new_return_bb = create_basic_block (NULL, 0, return_bb); @@ -1305,6 +1305,7 @@ split_function (basic_block return_bb, struct split_point *split_point, e->count = new_return_bb->count; add_bb_to_loop (new_return_bb, current_loops->tree_root); bitmap_set_bit (split_point->split_bbs, new_return_bb->index); + retbnd = find_retbnd (return_bb); } /* When we pass around the value, use existing return block. */ else diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a24de4266cd..7ac1418b9b8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-12-10 Richard Biener + + PR ipa/68721 + * gcc.dg/torture/pr68721.c: New testcase. + 2015-12-10 Richard Biener PR tree-optimization/68806 diff --git a/gcc/testsuite/gcc.dg/torture/pr68721.c b/gcc/testsuite/gcc.dg/torture/pr68721.c new file mode 100644 index 00000000000..297adabc8ba --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr68721.c @@ -0,0 +1,31 @@ +/* { dg-do run } */ + +extern void abort (void); + +int a, b, c, *d, **e = &d; + +int * +fn1 () +{ + for (;;) + { + for (; a;) + if (b) + abort (); + break; + } + for (; c;) + ; + return &a; +} + +int +main () +{ + *e = fn1 (); + + if (!d) + abort (); + + return 0; +} -- 2.30.2