PR tree-optimization/20076

	* tree-inline.c (inline_forbidden_p_1): Prevent inlining functions
	that call __builtin_return or __builtin_apply_args.

	* gcc.dg/builtin-apply4.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97653 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 50 insertions, 0 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8b51e091efe..f9034674f74 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/20076
+	* tree-inline.c (inline_forbidden_p_1): Prevent inlining functions
+	that call __builtin_return or __builtin_apply_args.
+
 2005-04-05  Andrew MacLeod  <amacleod@redhat.com>
 
 	* lambda-code.c (lambda_loopnest_to_gcc_loopnest): Use update_stmt.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e9a68b3e850..79bfe2300b5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-05  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/20076
+	* gcc.dg/builtin-apply4.c: New test.
+
 	PR preprocessor/19475
 	* gcc.dg/cpp/macspace1.c: New test.
 	* gcc.dg/cpp/macspace2.c: New test.
diff --git a/gcc/testsuite/gcc.dg/builtin-apply4.c b/gcc/testsuite/gcc.dg/builtin-apply4.c
new file mode 100644
index 00000000000..289694e3c1b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/builtin-apply4.c
@@ -0,0 +1,30 @@
+/* PR tree-optimization/20076 */
+/* { dg-options "-O2" } */
+/* { dg-do run } */
+
+extern void abort (void);
+
+double
+foo (int arg)
+{
+  if (arg != 116)
+    abort();
+  return arg + 1;
+}
+
+inline double
+bar (int arg)
+{
+  foo (arg);
+  __builtin_return (__builtin_apply ((void (*) ()) foo,
+				     __builtin_apply_args (), 16));
+}
+
+int
+main (int argc, char **argv)
+{
+  if (bar (116) != 117.0)
+    abort ();
+
+  return 0;
+}
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 59a2d7237c9..efa6e310e98 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1017,6 +1017,17 @@ inline_forbidden_p_1 (tree *nodep, int *walk_subtrees ATTRIBUTE_UNUSED,
 		   "it uses non-local goto");
 	    return node;
 
+	  case BUILT_IN_RETURN:
+	  case BUILT_IN_APPLY_ARGS:
+	    /* If a __builtin_apply_args caller would be inlined,
+	       it would be saving arguments of the function it has
+	       been inlined into.  Similarly __builtin_return would
+	       return from the function the inline has been inlined into.  */
+	    inline_forbidden_reason
+	      = N_("%Jfunction %qF can never be inlined because "
+		   "it uses __builtin_return or __builtin_apply_args");
+	    return node;
+
 	  default:
 	    break;
 	  }