Backport r249735

2017-09-15  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-06-28  Martin Liska  <mliska@suse.cz>

	PR ipa/81128
	* ipa-visibility.c (non_local_p): Handle visibility.
2017-09-15  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-06-28  Martin Liska  <mliska@suse.cz>

	PR ipa/81128
	* c-attribs.c (handle_alias_ifunc_attribute): Append ifunc alias
	to a function declaration.
2017-09-15  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-06-28  Martin Liska  <mliska@suse.cz>

	PR ipa/81128
	* gcc.target/i386/pr81128.c: New test.

From-SVN: r252792

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8bbe115c0b38dd9fc721c53270470b3705842f1c..0f78bd2305c31f2d3cce44bb247dd937b0a35d85 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-09-15  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-06-28  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/81128
+       * ipa-visibility.c (non_local_p): Handle visibility.
+
 2017-09-12  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        Backport from mainline

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 4025a03680ce288a9a34d53a49d9837a6d3ea208..e4f7f99e2f1b9effc555656f7508d3f9e0101dc0 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,12 @@
+2017-09-15  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-06-28  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/81128
+       * c-attribs.c (handle_alias_ifunc_attribute): Append ifunc alias
+       to a function declaration.
+
 2017-09-10  Jonathan Wakely  <jwakely@redhat.com>
 
        PR c++/81852

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 6cf8c610b4edc37e321db36c71163aaebadadb79..dec1acbeb5a62974a1e9a38ab10dd54f031bc804 100644 (file)
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -7989,9 +7989,14 @@ handle_alias_ifunc_attribute (bool is_alias, tree *node, tree name, tree args,
        TREE_STATIC (decl) = 1;
 
       if (!is_alias)
-       /* ifuncs are also aliases, so set that attribute too. */
-       DECL_ATTRIBUTES (decl)
-         = tree_cons (get_identifier ("alias"), args, DECL_ATTRIBUTES (decl));
+       {
+         /* ifuncs are also aliases, so set that attribute too.  */
+         DECL_ATTRIBUTES (decl)
+           = tree_cons (get_identifier ("alias"), args,
+                        DECL_ATTRIBUTES (decl));
+         DECL_ATTRIBUTES (decl) = tree_cons (get_identifier ("ifunc"),
+                                             NULL, DECL_ATTRIBUTES (decl));
+       }
     }
   else
     {

diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index adc4426e6be9020e5cc471324db7c870eec57be5..520c659899e525591ca61da2cc0b6c4b33b0514f 100644 (file)
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -97,7 +97,8 @@ non_local_p (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
           && !DECL_EXTERNAL (node->decl)
           && !node->externally_visible
           && !node->used_from_other_partition
-          && !node->in_other_partition);
+          && !node->in_other_partition
+          && node->get_availability () >= AVAIL_AVAILABLE);
 }
 
 /* Return true when function can be marked local.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c9a10a6e1d4381b227446a9bcd477ec8d16063c7..3b6bc3ec6c3f02dde20d180b3e867e1a2ec31bd7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2017-09-15  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-06-28  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/81128
+       * gcc.target/i386/pr81128.c: New test.
+
 2017-09-12  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.target/i386/pr81128.c b/gcc/testsuite/gcc.target/i386/pr81128.c
new file mode 100644 (file)
index 0000000..90a567a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr81128.c
@@ -0,0 +1,65 @@
+/* PR ipa/81128 */
+/* { dg-do run } */
+/* { dg-options "-O3" } */
+/* { dg-require-ifunc "" } */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+int resolver_fn = 0;
+int resolved_fn = 0;
+
+static inline void
+do_it_right_at_runtime_A ()
+{
+  resolved_fn++;
+}
+
+static inline void
+do_it_right_at_runtime_B ()
+{
+  resolved_fn++;
+}
+
+static inline void do_it_right_at_runtime (void);
+
+void do_it_right_at_runtime (void)
+  __attribute__ ((ifunc ("resolve_do_it_right_at_runtime")));
+
+static void (*resolve_do_it_right_at_runtime (void)) (void)
+{
+  srand (time (NULL));
+  int r = rand ();
+  resolver_fn++;
+
+  /* Use intermediate variable to get a warning for non-matching
+   * prototype. */
+  typeof(do_it_right_at_runtime) *func;
+  if (r & 1)
+    func = do_it_right_at_runtime_A;
+  else
+    func = do_it_right_at_runtime_B;
+
+  return (void *) func;
+}
+
+int
+main (void)
+{
+  const unsigned int ITERS = 10;
+
+  for (int i = ITERS; i > 0; i--)
+    {
+      do_it_right_at_runtime ();
+    }
+
+  if (resolver_fn != 1)
+    __builtin_abort ();
+
+  if (resolved_fn != 10)
+    __builtin_abort ();
+
+  return 0;
+}