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  <rguenther@suse.de>

	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.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 618f60103027b45a4f68b3d50bd918f41d7f0d85..f6fb1e46fe6aab5f60241a0c468cb2e4f8a4aa75 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2020-05-12  Richard Biener  <rguenther@suse.de>
+
+       Backport from mainline
+       2020-05-05  Richard Biener  <rguenther@suse.de>
+
+       PR ipa/94947
+       * tree-ssa-structalias.c (ipa_pta_execute): Use
+       varpool_node::externally_visible_p ().
+       (refered_from_nonlocal_var): Likewise.
+
 2020-05-12  David Edelsohn  <dje.gcc@gmail.com>
 
        Backport from mainline

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5e161a1c2ba7af245b37d17d75ecf75747cebf8d..574d8cad160831038fdd38eac0325c4a3c340b77 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2020-05-12  Richard Biener  <rguenther@suse.de>
+
+       Backport from mainline
+       2020-05-05  Richard Biener  <rguenther@suse.de>
+
+       PR ipa/94947
+       * gcc.dg/torture/pr94947-1.c: New testcase.
+       * gcc.dg/torture/pr94947-2.c: Likewise.
+
 2020-05-12  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.dg/torture/pr94947-1.c b/gcc/testsuite/gcc.dg/torture/pr94947-1.c
new file mode 100644 (file)
index 0000000..ab8b488
--- /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 (file)
index 0000000..670dd61
--- /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 416a26c996cc2300115047aec56fd0bda1e13375..e9fcafd9b34080a9b959c80a493d4fc1bbf13735 100644 (file)
--- 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);