From 2b187c63e263707a88b01352880a24107baa88be Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 18 Jul 2003 03:05:27 +0000 Subject: [PATCH] re PR rtl-optimization/11557 (constant folding) PR optimization/11557 * calls.c (flags_from_decl_or_type): Do not set ECF_LIBCALL_BLOCK unless we know which function is being called. PR optimization/11557 * gcc.dg/20030717-1.c: New test. From-SVN: r69538 --- gcc/ChangeLog | 6 ++++++ gcc/calls.c | 5 ++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/20030717-1.c | 24 ++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/20030717-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3784190c923..0fe5852478a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-07-17 Mark Mitchell + + PR optimization/11557 + * calls.c (flags_from_decl_or_type): Do not set ECF_LIBCALL_BLOCK + unless we know which function is being called. + 2003-07-17 Roger Sayle * cse.c (fold_rtx): Use swap_commutative_operands_p to determine diff --git a/gcc/calls.c b/gcc/calls.c index ef4926ee770..845934e2cb5 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -730,10 +730,13 @@ flags_from_decl_or_type (tree exp) if (TREE_NOTHROW (exp)) flags |= ECF_NOTHROW; + + if (TREE_READONLY (exp) && ! TREE_THIS_VOLATILE (exp)) + flags |= ECF_LIBCALL_BLOCK; } if (TREE_READONLY (exp) && ! TREE_THIS_VOLATILE (exp)) - flags |= ECF_CONST | ECF_LIBCALL_BLOCK; + flags |= ECF_CONST; if (TREE_THIS_VOLATILE (exp)) flags |= ECF_NORETURN; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b0b3f4430d2..91f7815eaf3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-07-17 Mark Mitchell + + PR optimization/11557 + * gcc.dg/20030717-1.c: New test. + 2003-07-17 Andrew Pinski PR c++/10476 diff --git a/gcc/testsuite/gcc.dg/20030717-1.c b/gcc/testsuite/gcc.dg/20030717-1.c new file mode 100644 index 00000000000..6a7f6de6f44 --- /dev/null +++ b/gcc/testsuite/gcc.dg/20030717-1.c @@ -0,0 +1,24 @@ +/* { dg-do run } */ +/* { dg-options "-O2" } */ + +extern void abort (void); + +int zero (void) +{ + return 0; +} + +int one (void) +{ + return 1; +} + +int main (void) +{ + int i = 1; + int r = (i ? one : zero)(); + if (r != 1) + abort(); + return 0; +} + -- 2.30.2