From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1075) id C342A3858435; Thu, 25 Nov 2021 11:25:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C342A3858435 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jan Hubicka To: gcc-cvs@gcc.gnu.org Subject: [gcc r10-10294] Fix looping flag discovery in ipa-pure-const X-Act-Checkin: gcc X-Git-Author: Jan Hubicka X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: a8f772a45c6c65c1062fd270c796bb03c6523ce6 X-Git-Newrev: 298a4694f89ecb512be8ecba0512558996961fae Message-Id: <20211125112550.C342A3858435@sourceware.org> Date: Thu, 25 Nov 2021 11:25:50 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Nov 2021 11:25:50 -0000 https://gcc.gnu.org/g:298a4694f89ecb512be8ecba0512558996961fae commit r10-10294-g298a4694f89ecb512be8ecba0512558996961fae Author: Jan Hubicka Date: Sun Nov 21 00:35:22 2021 +0100 Fix looping flag discovery in ipa-pure-const The testcase shows situation where there is non-trivial cycle in the callgraph involving a noreturn call. This cycle is important for const function discovery but not important for pure. IPA pure const uses same strongly connected components for both propagations which makes it to get suboptimal result (does not detect the pure flag). However local pure const gets the situation right becaue it processes functions in right order. This hits rarely executed code in propagate_pure_const that merge results with previously known state that has long standing bug in it that makes it to throw away the looping flag. Bootstrapped/regtested x86_64-linux. gcc/ChangeLog: 2021-11-21 Jan Hubicka PR ipa/103052 * ipa-pure-const.c (propagate_pure_const): Fix merging of loping flag. gcc/testsuite/ChangeLog: 2021-11-21 Jan Hubicka PR ipa/103052 * gcc.c-torture/execute/pr103052.c: New test. (cherry picked from commit a0e99d5bb741d3db74a67d492f47b28217fbf88a) Diff: --- gcc/ipa-pure-const.c | 4 +-- gcc/testsuite/gcc.c-torture/execute/pr103052.c | 35 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c index 564c6629c92..890826aea4c 100644 --- a/gcc/ipa-pure-const.c +++ b/gcc/ipa-pure-const.c @@ -1665,9 +1665,9 @@ propagate_pure_const (void) if (w_l->state_previously_known != IPA_NEITHER && this_state > w_l->state_previously_known) { - this_state = w_l->state_previously_known; if (this_state == IPA_NEITHER) - this_looping = w_l->looping_previously_known; + this_looping = w_l->looping_previously_known; + this_state = w_l->state_previously_known; } if (!this_looping && self_recursive_p (w)) this_looping = true; diff --git a/gcc/testsuite/gcc.c-torture/execute/pr103052.c b/gcc/testsuite/gcc.c-torture/execute/pr103052.c new file mode 100644 index 00000000000..bef8674a43c --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr103052.c @@ -0,0 +1,35 @@ +static void js_error(void); +static int top; +static void js_throw(void) +{ + __builtin_exit(0); +} + +// LOCATION A -- if js_pop is here, the bug is present +static void js_pop(void) +{ + if (++top > 100) + js_error(); +} + +static void jsC_error(const char *v) +{ + if (v[0] == 0) + js_error(); + js_throw(); +} +static void checkfutureword(const char *exp) +{ + if (!__builtin_strcmp(exp, "const")) + jsC_error("boom"); +} +static void js_error(void) { + checkfutureword("foo"); + checkfutureword("bar"); + js_pop(); +} +int main(void) +{ + checkfutureword("const"); + __builtin_abort (); +}