diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index af5e6d0..70c7f3e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-05-06 Jason Merrill <jason@redhat.com> + * decl.c (stabilize_save_expr_r): Set *walk_subtrees as + appropriate. + PR c++/48909 * semantics.c (cxx_eval_conditional_expression): Check integer_zerop instead. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e766503..764d5df 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7615,8 +7615,9 @@ stabilize_save_expr_r (tree *expr_p, int *walk_subtrees, void *data) cp_walk_tree (&op, stabilize_save_expr_r, data, pset); if (TREE_SIDE_EFFECTS (op)) TREE_OPERAND (expr, 0) = get_temp_regvar (TREE_TYPE (op), op); + *walk_subtrees = 0; } - else if (!EXPR_P (expr)) + else if (!EXPR_P (expr) || !TREE_SIDE_EFFECTS (expr)) *walk_subtrees = 0; return NULL; } |