re PR target/44290 (__naked attribute is broken)

	PR target/44290
	* attribs.c (decl_attributes): Insert "noinline" and "noclone"
	if "naked".
	* tree-sra.c (ipa_sra_preliminary_function_checks): Return
	false if ! tree_versionable_function_p.

	testsuite/
	PR target/44290
	* gcc.dg/pr44290-1.c: New test.
	* gcc.dg/pr44290-2.c: New test.

From-SVN: r162466

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4873ccdbbd850d6da61d3273c8f4c6cd2ae55bc2..adc38f49d2ebff0adbbf89916f40c5fcd429917a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-23  Jie Zhang  <jie@codesourcery.com>
+
+       PR target/44290
+       * attribs.c (decl_attributes): Insert "noinline" and "noclone"
+       if "naked".
+       * tree-sra.c (ipa_sra_preliminary_function_checks): Return
+       false if ! tree_versionable_function_p.
+
 2010-07-23  Nathan Froyd  <froydnj@codesourcery.com>
 
        * builtins.def (BUILT_IN_ARGS_INFO): Remove.

diff --git a/gcc/attribs.c b/gcc/attribs.c
index 0d7c13218b5b3846ba532def978a55e75f165c6b..d8daa6f5ed6de2d166851cde7081e2f75564fce9 100644 (file)
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -276,6 +276,19 @@ decl_attributes (tree *node, tree attributes, int flags)
        TREE_VALUE (cur_attr) = chainon (opts, TREE_VALUE (cur_attr));
     }
 
+  /* A "naked" function attribute implies "noinline" and "noclone" for
+     those targets that support it.  */
+  if (TREE_CODE (*node) == FUNCTION_DECL
+      && lookup_attribute_spec (get_identifier ("naked"))
+      && lookup_attribute ("naked", attributes) != NULL)
+    {
+      if (lookup_attribute ("noinline", attributes) == NULL)
+       attributes = tree_cons (get_identifier ("noinline"), NULL, attributes);
+
+      if (lookup_attribute ("noclone", attributes) == NULL)
+       attributes = tree_cons (get_identifier ("noclone"),  NULL, attributes);
+    }
+
   targetm.insert_attributes (*node, &attributes);
 
   for (a = attributes; a; a = TREE_CHAIN (a))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8acb4b22dab72dc4a32a77134c5b95685a780248..35923e208768c50d643acb560563a773b16e22b5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-23  Jie Zhang  <jie@codesourcery.com>
+
+       PR target/44290
+       * gcc.dg/pr44290-1.c: New test.
+       * gcc.dg/pr44290-2.c: New test.
+
 2010-07-23  Jason Merrill  <jason@redhat.com>
 
        PR c++/45008

diff --git a/gcc/testsuite/gcc.dg/pr44290-1.c b/gcc/testsuite/gcc.dg/pr44290-1.c
new file mode 100644 (file)
index 0000000..071a271
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr44290-1.c
@@ -0,0 +1,18 @@
+/* { dg-do compile { target arm*-*-* avr-*-* mcore-*-* rx-*-* spu-*-* } } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+static void __attribute__((naked))
+foo(void *from, void *to)
+{
+  asm volatile("dummy"::"r"(from), "r"(to));
+}
+
+unsigned int fie[2];
+
+void fum(void *to)
+{
+  foo(fie, to);
+}
+
+/* { dg-final { scan-tree-dump "foo \\\(void \\\* from, void \\\* to\\\)" "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */

diff --git a/gcc/testsuite/gcc.dg/pr44290-2.c b/gcc/testsuite/gcc.dg/pr44290-2.c
new file mode 100644 (file)
index 0000000..1951a51
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr44290-2.c
@@ -0,0 +1,24 @@
+/* { dg-do compile { target arm*-*-* avr-*-* mcore-*-* rx-*-* spu-*-* } } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+static unsigned long __attribute__((naked))
+foo (unsigned long base)
+{
+  asm volatile ("dummy");
+}
+unsigned long
+bar (void)
+{
+  static int start, set;
+
+  if (!set)
+    {
+      set = 1;
+      start = foo (0);
+    }
+
+  return foo (start);
+}
+
+/* { dg-final { scan-tree-dump "foo \\\(long unsigned int base\\\)" "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 2ac6458e0f5be5830b5cd40a5c23a811b3887372..2bd9f97e1de3aaf9be962d2172b59506c346ed33 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -4301,6 +4301,13 @@ modify_function (struct cgraph_node *node, ipa_parm_adjustment_vec adjustments)
 static bool
 ipa_sra_preliminary_function_checks (struct cgraph_node *node)
 {
+  if (!tree_versionable_function_p (current_function_decl))
+    {
+      if (dump_file)
+       fprintf (dump_file, "Function isn't allowed to be versioned.\n");
+      return false;
+    }
+
   if (!cgraph_node_can_be_local_p (node))
     {
       if (dump_file)