aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/calls.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/20030717-1.c24
4 files changed, 39 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3784190..0fe5852 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-17 Mark Mitchell <mark@codesourcery.com>
+
+ 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 <roger@eyesopen.com>
* cse.c (fold_rtx): Use swap_commutative_operands_p to determine
diff --git a/gcc/calls.c b/gcc/calls.c
index ef4926e..845934e 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 b0b3f44..91f7815 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-17 Mark Mitchell <mark@codesourcery.com>
+
+ PR optimization/11557
+ * gcc.dg/20030717-1.c: New test.
+
2003-07-17 Andrew Pinski <pinskia@physics.uc.edu>
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 0000000..6a7f6de
--- /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;
+}
+