From f9b5db750bc7fbba69fee93564907f7da1bca35f Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 5 May 2020 13:09:50 +0200 Subject: [PATCH] ipa/94947 - fix test for externally visible variables for IPA PTA This fixes lack of an escape point of externally declared variables. 2020-05-05 Richard Biener PR ipa/94947 * tree-ssa-structalias.c (ipa_pta_execute): Use varpool_node::externally_visible_p (). (refered_from_nonlocal_var): Likewise. * gcc.dg/torture/pr94947-1.c: New testcase. * gcc.dg/torture/pr94947-2.c: Likewise. --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.dg/torture/pr94947-1.c | 23 +++++++++++++++++++++++ gcc/testsuite/gcc.dg/torture/pr94947-2.c | 7 +++++++ gcc/tree-ssa-structalias.c | 6 +++--- 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr94947-1.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr94947-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 71977b57e6e..9178e9d14c8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2020-05-05 Richard Biener + + PR ipa/94947 + * tree-ssa-structalias.c (ipa_pta_execute): Use + varpool_node::externally_visible_p (). + (refered_from_nonlocal_var): Likewise. + 2020-05-05 Eric Botcazou * gcc.c (LTO_PLUGIN_SPEC): Define if not already. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7f973949a7f..eb81b0ac433 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-05-05 Richard Biener + + PR ipa/94947 + * gcc.dg/torture/pr94947-1.c: New testcase. + * gcc.dg/torture/pr94947-2.c: Likewise. + 2020-05-05 Eric Botcazou * gnat.dg/aggr29.adb: New test. diff --git a/gcc/testsuite/gcc.dg/torture/pr94947-1.c b/gcc/testsuite/gcc.dg/torture/pr94947-1.c new file mode 100644 index 00000000000..ab8b488c6fc --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr94947-1.c @@ -0,0 +1,23 @@ +/* { dg-do run } */ +/* { dg-additional-sources "pr94947-2.c" } */ +/* { dg-additional-options "-fipa-pta -flto-partition=1to1" } */ + +extern void abort (); +extern void baz (); +extern void (*baz_call)(); +static int *p; + +static void foo () +{ + if (*p != 1) + abort (); +} + +int main() +{ + int x = 1; + p = &x; + baz_call = foo; + baz (); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr94947-2.c b/gcc/testsuite/gcc.dg/torture/pr94947-2.c new file mode 100644 index 00000000000..670dd61c1e9 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr94947-2.c @@ -0,0 +1,7 @@ +/* { dg-do compile } */ + +void (*baz_call)(); +void baz () +{ + baz_call (); +} diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 416a26c996c..e9fcafd9b34 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -8097,7 +8097,7 @@ refered_from_nonlocal_var (struct varpool_node *node, void *data) { bool *nonlocal_p = (bool *)data; *nonlocal_p |= (node->used_from_other_partition - || node->externally_visible + || node->externally_visible_p () || node->force_output); return false; } @@ -8187,8 +8187,8 @@ ipa_pta_execute (void) /* For the purpose of IPA PTA unit-local globals are not escape points. */ - bool nonlocal_p = (var->used_from_other_partition - || var->externally_visible + bool nonlocal_p = (var->externally_visible_p () + || var->used_from_other_partition || var->force_output); var->call_for_symbol_and_aliases (refered_from_nonlocal_var, &nonlocal_p, true); -- 2.30.2