diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-06 11:46:14 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-06 11:46:14 +0000 |
| commit | 5bc2d161c3700f4916bcdef05043a8420d8c0ebe (patch) | |
| tree | 101e91a6417a24e387ff54457e65a09b5a003ffa | |
| parent | 701245b3347bb4ac5433de15e4c69924c2d1a7e8 (diff) | |
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/branches/gcc-4_6-branch@174696 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/calls.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr49243.c | 25 |
4 files changed, 38 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 23b77048c0d..c2afeaee668 100644 --- 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 Richard Guenther <rguenther@suse.de> PR tree-optimization/48702 diff --git a/gcc/calls.c b/gcc/calls.c index f539f665800..1c161bf3330 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -548,6 +548,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 b3199f90176..065240f9ed7 100644 --- 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 Richard Guenther <rguenther@suse.de> PR tree-optimization/48702 diff --git a/gcc/testsuite/gcc.dg/pr49243.c b/gcc/testsuite/gcc.dg/pr49243.c new file mode 100644 index 00000000000..f896b05b060 --- /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(); +} |