2011-06-06 Mikael Pettersson <mikpe@it.uu.se>

	PR tree-optimization/49243
	* calls.c (setjmp_call_p): Also check if fndecl has the
	returns_twice attribute.

	* gcc.dg/pr49243.c: New.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3897ba4..3f01f25 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-06  Mikael Pettersson  <mikpe@it.uu.se>
+
+       PR tree-optimization/49243
+       * calls.c (setjmp_call_p): Also check if fndecl has the
+       returns_twice attribute.
+
 2011-06-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * config/mips/iris6.h (ENDFILE_SPEC): Use crtfastmath.o if

diff --git a/gcc/calls.c b/gcc/calls.c
index f5592c5..feb98d2 100644 (file)
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -567,6 +567,8 @@ special_function_p (const_tree fndecl, int flags)
 int
 setjmp_call_p (const_tree fndecl)
 {
+  if (DECL_IS_RETURNS_TWICE (fndecl))
+    return ECF_RETURNS_TWICE;
   return special_function_p (fndecl, 0) & ECF_RETURNS_TWICE;
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e904e6..1c0a71a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-06  Mikael Pettersson  <mikpe@it.uu.se>
+
+       PR tree-optimization/49243
+       * gcc.dg/pr49243.c: New.
+
 2011-06-06  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/specs/cond_expr1.ads: New test.

diff --git a/gcc/testsuite/gcc.dg/pr49243.c b/gcc/testsuite/gcc.dg/pr49243.c
new file mode 100644 (file)
index 0000000..f896b05
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr49243.c
@@ -0,0 +1,25 @@
+/* PR tree-optimization/49243 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -Winline" } */
+
+extern unsigned long jb[];
+extern int my_setjmp(unsigned long jb[]) __attribute__((returns_twice));
+extern int decode(const char*);
+
+static inline int wrapper(const char **s_ptr) /* { dg-warning "(inlining failed|function 'wrapper' can never be inlined because it uses setjmp)" } */
+{
+    if (my_setjmp(jb) == 0) {
+       const char *s = *s_ptr;
+       while (decode(s) != 0)
+           *s_ptr = ++s;
+       return 0;
+    } else
+       return -1;
+}
+
+void parse(const char *data)
+{
+    const char *s = data;
+    if (!(wrapper(&s) == -1 && (s - data) == 1)) /* { dg-warning "called from here" } */
+       __builtin_abort();
+}