diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 683219fd952..dc7a57d47e3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2002-12-05 Dale Johannesen + + * tree.c (unsafe_for_reeval): Consider callee child of CALL_EXPR. + 2002-12-05 Danny Smith * config/i386/cygwin.h (SUBTARGET_PROLOGUE): Replace with diff --git a/gcc/testsuite/gcc.dg/20021205-1.c b/gcc/testsuite/gcc.dg/20021205-1.c new file mode 100644 index 00000000000..a1876257e2f --- /dev/null +++ b/gcc/testsuite/gcc.dg/20021205-1.c @@ -0,0 +1,10 @@ +/* dg-do compile */ +/* dg-options "-O3" */ +typedef struct x x; +struct x { char * (*bar) (int); }; +static x **foo() { return ((x**)baz()); } +int xyzzy() +{ + baz((*foo())->bar(0)); + return 3; +} diff --git a/gcc/tree.c b/gcc/tree.c index dfac289f137..04fddb26dd3 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -1634,7 +1634,7 @@ unsafe_for_reeval (expr) { int unsafeness = 0; enum tree_code code; - int i, tmp; + int i, tmp, tmp2; tree exp; int first_rtl; @@ -1660,8 +1660,9 @@ unsafe_for_reeval (expr) return unsafeness; case CALL_EXPR: + tmp2 = unsafe_for_reeval (TREE_OPERAND (expr, 0)); tmp = unsafe_for_reeval (TREE_OPERAND (expr, 1)); - return MAX (tmp, 1); + return MAX (MAX (tmp, 1), tmp2); case TARGET_EXPR: unsafeness = 1;