diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gimplify.c | 22 | ||||
| -rw-r--r-- | gcc/stor-layout.c | 4 |
3 files changed, 28 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 262600c02e2..b9fbcfb0073 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-12-21 Richard Henderson <rth@redhat.com> + + * gimplify.c (eval_save_expr): New. + (gimplify_one_sizepos): Use it. + * stor-layout.c (layout_type): Unshare TYPE_MIN/MAX_VALUE. + 2004-12-21 Nathan Sidwell <nathan@codesourcery.com> * system.c (IN_RANGE): Use plain unsigned, not unsigned diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 34b22cc6781..c92d9a5e4bc 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -4217,7 +4217,25 @@ gimplify_type_sizes (tree type, tree *list_p) gimplify_one_sizepos (&TYPE_SIZE_UNIT (type), list_p); } -/* Subroutine of the above to gimplify one size or position, *EXPR_P. +/* A subroutine of gimplify_one_sizepos, called via walk_tree. Evaluate + the expression if it's a SAVE_EXPR and add it to the statement list + in DATA. */ + +static tree +eval_save_expr (tree *tp, int *walk_subtrees, void *data) +{ + if (TREE_CODE (*tp) == SAVE_EXPR) + { + *walk_subtrees = 0; + gimplify_and_add (*tp, (tree *) data); + } + else if (TYPE_P (*tp) || DECL_P (*tp)) + *walk_subtrees = 0; + return NULL; +} + +/* A subroutine of gimplify_type_sizes to make sure that *EXPR_P, + a size or position, has had all of its SAVE_EXPRs evaluated. We add any required statements to STMT_P. */ void @@ -4233,7 +4251,7 @@ gimplify_one_sizepos (tree *expr_p, tree *stmt_p) || CONTAINS_PLACEHOLDER_P (*expr_p)) return; - gimplify_expr (expr_p, stmt_p, NULL, is_gimple_val, fb_rvalue); + walk_tree (expr_p, eval_save_expr, stmt_p, NULL); } #ifdef ENABLE_CHECKING diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 7069ad9b2ec..13fdb3cf14c 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -1644,8 +1644,8 @@ layout_type (tree type) if (index && TYPE_MAX_VALUE (index) && TYPE_MIN_VALUE (index) && TYPE_SIZE (element)) { - tree ub = TYPE_MAX_VALUE (index); - tree lb = TYPE_MIN_VALUE (index); + tree ub = unshare_expr (TYPE_MAX_VALUE (index)); + tree lb = unshare_expr (TYPE_MIN_VALUE (index)); tree length; tree element_size; |