From 84d8756de1f15d0d04a959133930bfc95e3c5acb Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Tue, 29 Apr 2003 22:38:09 +0000 Subject: [PATCH] * tree.c (save_expr): Don't fold a COMPONENT_REF. From-SVN: r66264 --- gcc/ChangeLog | 4 ++++ gcc/tree.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 589009a8285..61ec00e0705 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2003-04-29 Richard Kenner + + * tree.c (save_expr): Don't fold a COMPONENT_REF. + 2003-04-29 Olivier Hainque * calls.c (expand_call): When modes of target and valreg match, force diff --git a/gcc/tree.c b/gcc/tree.c index ce5e21997b1..7deaa656409 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -1378,14 +1378,21 @@ tree save_expr (expr) tree expr; { - tree t = fold (expr); - tree inner = skip_simple_arithmetic (t); + tree t = expr; + tree inner; + + /* Don't fold a COMPONENT_EXPR: if the operand was a CONSTRUCTOR (the + only time it will fold), it can cause problems with PLACEHOLDER_EXPRs + in Ada. Moreover, it isn't at all clear why we fold here at all. */ + if (TREE_CODE (t) != COMPONENT_REF) + t = fold (t); /* If the tree evaluates to a constant, then we don't want to hide that fact (i.e. this allows further folding, and direct checks for constants). However, a read-only object that has side effects cannot be bypassed. Since it is no problem to reevaluate literals, we just return the literal node. */ + inner = skip_simple_arithmetic (t); if (TREE_CONSTANT (inner) || (TREE_READONLY (inner) && ! TREE_SIDE_EFFECTS (inner)) || TREE_CODE (inner) == SAVE_EXPR