From 0d21cbc776f7eff52137e72df2aa9f704fd1355a Mon Sep 17 00:00:00 2001 From: jakub Date: Wed, 27 Aug 2003 10:52:09 +0000 Subject: [PATCH] * builtins.c (expand_builtin_expect_jump): Save pending_stack_adjust and restore it if returning NULL. * gcc.dg/20030826-2.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70844 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++ gcc/builtins.c | 6 +++- gcc/testsuite/ChangeLog | 4 +++ gcc/testsuite/gcc.dg/20030826-2.c | 64 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/20030826-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ef8624f..0300d78 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-08-27 Jakub Jelinek + + * builtins.c (expand_builtin_expect_jump): Save pending_stack_adjust + and restore it if returning NULL. + 2003-08-27 Richard Sandiford * calls.c (initialize_argument_information): If an argument has no diff --git a/gcc/builtins.c b/gcc/builtins.c index 227bb49..37dc4e5 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -4330,6 +4330,7 @@ expand_builtin_expect_jump (tree exp, rtx if_false_label, rtx if_true_label) && (integer_zerop (arg1) || integer_onep (arg1))) { int num_jumps = 0; + int save_pending_stack_adjust = pending_stack_adjust; rtx insn; /* If we fail to locate an appropriate conditional jump, we'll @@ -4421,7 +4422,10 @@ expand_builtin_expect_jump (tree exp, rtx if_false_label, rtx if_true_label) /* If no jumps were modified, fail and do __builtin_expect the normal way. */ if (num_jumps == 0) - ret = NULL_RTX; + { + ret = NULL_RTX; + pending_stack_adjust = save_pending_stack_adjust; + } } return ret; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2cabf34..2e96a62 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2003-08-27 Jakub Jelinek + + * gcc.dg/20030826-2.c: New test. + 2003-08-26 Roger Sayle PR middle-end/12002 diff --git a/gcc/testsuite/gcc.dg/20030826-2.c b/gcc/testsuite/gcc.dg/20030826-2.c new file mode 100644 index 0000000..f25887d --- /dev/null +++ b/gcc/testsuite/gcc.dg/20030826-2.c @@ -0,0 +1,64 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fomit-frame-pointer" } */ +/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target i?86-*-* } } */ + +extern void abort (void); +extern void exit (int); + +struct S +{ + int *a; + unsigned char *b, c; +}; + +int u, v, w; + +void +foo (unsigned short x) +{ + u += x; +} + +int +bar (struct S **x, int *y) +{ + w += *y; + *y = w + 25; + return 0; +} + +int +baz (struct S **x) +{ + struct S *y = *x; + unsigned char *a = y->b; + + foo (*a); + + if (__builtin_expect (y->c != 0 || y->a == &v, 0)) + return 1; + + if (__builtin_expect (*a == 1, 0)) + { + int a, b = bar (x, &a); + + if (a) + return b; + } + + return 0; +} + +int +main (void) +{ + struct S a, *b = &a; + unsigned char c; + + __builtin_memset (b, 0, sizeof (a)); + a.a = &v; + a.b = &c; + if (baz (&b) != 1) + abort (); + exit (0); +} -- 2.7.4