diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/builtins.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/pr85156.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/pr85156.c | 21 |
5 files changed, 45 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fea1bed..78d14af 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-04-03 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/85156 + * builtins.c (fold_builtin_expect): Use save_expr on arg1 to avoid + evaluating the argument multiple times. + 2018-04-03 Bill Schmidt <wschmidt@linux.ibm.com> * config/rs6000/emmintrin.h (_mm_cvtpd_epi32): Use __vector rather diff --git a/gcc/builtins.c b/gcc/builtins.c index 0c56018..e0f6c2a 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -7998,6 +7998,7 @@ fold_builtin_expect (location_t loc, tree arg0, tree arg1, tree arg2) { tree op0 = TREE_OPERAND (inner, 0); tree op1 = TREE_OPERAND (inner, 1); + arg1 = save_expr (arg1); op0 = build_builtin_expect_predicate (loc, op0, arg1, arg2); op1 = build_builtin_expect_predicate (loc, op1, arg1, arg2); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4bd6d26..6d1322c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-04-03 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/85156 + * c-c++-common/pr85156.c: New test. + * gcc.c-torture/execute/pr85156.c: New test. + 2018-04-03 Bill Schmidt <wschmidt@linux.ibm.com> * gcc.target/powerpc/powerpc.exp: Add .C suffix for main loop. diff --git a/gcc/testsuite/c-c++-common/pr85156.c b/gcc/testsuite/c-c++-common/pr85156.c new file mode 100644 index 0000000..4f5986b --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr85156.c @@ -0,0 +1,11 @@ +/* PR tree-optimization/85156 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -g" } */ + +int a, b; + +int +foo (void) +{ + return __builtin_expect (a ? b != 0 : 0, ({ 1; })); +} diff --git a/gcc/testsuite/gcc.c-torture/execute/pr85156.c b/gcc/testsuite/gcc.c-torture/execute/pr85156.c new file mode 100644 index 0000000..a296837 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr85156.c @@ -0,0 +1,21 @@ +/* PR tree-optimization/85156 */ + +int x, y; + +__attribute__((noipa)) int +foo (int z) +{ + if (__builtin_expect (x ? y != 0 : 0, z++)) + return 7; + return z; +} + +int +main () +{ + x = 1; + asm volatile ("" : "+m" (x), "+m" (y)); + if (foo (10) != 11) + __builtin_abort (); + return 0; +} |