diff options
| author | sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-04-03 03:07:40 +0000 |
|---|---|---|
| committer | sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-04-03 03:07:40 +0000 |
| commit | 535664e3ad516768f57ba0112323411554854745 (patch) | |
| tree | 064485fefb93789485a6ad2a21503d015fe218a0 /gcc/expr.h | |
| parent | 56b5a6e5e532ddb962fc64b41c8b1aeff3138ab6 (diff) | |
* builtins.c (dummy_object): Use build_int_cst instead of convert.
* tree-ssa-ccp.c (maybe_fold_stmt_addition): Use fold_convert
instead of convert.
* dojump.c (do_jump): Likewise.
* expr.h (ADD_PARM_SIZE, SUB_PARM_SIZE, ARGS_SIZE_TREE): Likewise.
* gimplify.c (gimple_boolify, gimplify_init_constructor,
gimplify_boolean_expr): Likewise.
* emit-rtl.c (set_mem_attributes_minus_bitpos): Likewise.
* varasm.c (array_size_for_constructor): Likewise.
* tree-object-size.c (compute_object_offset): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112633 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/expr.h')
| -rw-r--r-- | gcc/expr.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/gcc/expr.h b/gcc/expr.h index c3e0b92e082..9ba5d4e7da9 100644 --- a/gcc/expr.h +++ b/gcc/expr.h @@ -29,8 +29,8 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA #include "rtl.h" /* For optimize_size */ #include "flags.h" -/* For host_integerp, tree_low_cst, convert, size_binop, ssize_int, TREE_CODE, - TYPE_SIZE, int_size_in_bytes, */ +/* For host_integerp, tree_low_cst, fold_convert, size_binop, ssize_int, + TREE_CODE, TYPE_SIZE, int_size_in_bytes, */ #include "tree.h" /* For GET_MODE_BITSIZE, word_mode */ #include "machmode.h" @@ -123,36 +123,36 @@ struct locate_and_pad_arg_data /* Add the value of the tree INC to the `struct args_size' TO. */ -#define ADD_PARM_SIZE(TO, INC) \ -do { \ - tree inc = (INC); \ - if (host_integerp (inc, 0)) \ - (TO).constant += tree_low_cst (inc, 0); \ - else if ((TO).var == 0) \ - (TO).var = convert (ssizetype, inc); \ - else \ - (TO).var = size_binop (PLUS_EXPR, (TO).var, \ - convert (ssizetype, inc)); \ +#define ADD_PARM_SIZE(TO, INC) \ +do { \ + tree inc = (INC); \ + if (host_integerp (inc, 0)) \ + (TO).constant += tree_low_cst (inc, 0); \ + else if ((TO).var == 0) \ + (TO).var = fold_convert (ssizetype, inc); \ + else \ + (TO).var = size_binop (PLUS_EXPR, (TO).var, \ + fold_convert (ssizetype, inc)); \ } while (0) -#define SUB_PARM_SIZE(TO, DEC) \ -do { \ - tree dec = (DEC); \ - if (host_integerp (dec, 0)) \ - (TO).constant -= tree_low_cst (dec, 0); \ - else if ((TO).var == 0) \ - (TO).var = size_binop (MINUS_EXPR, ssize_int (0), \ - convert (ssizetype, dec)); \ - else \ - (TO).var = size_binop (MINUS_EXPR, (TO).var, \ - convert (ssizetype, dec)); \ +#define SUB_PARM_SIZE(TO, DEC) \ +do { \ + tree dec = (DEC); \ + if (host_integerp (dec, 0)) \ + (TO).constant -= tree_low_cst (dec, 0); \ + else if ((TO).var == 0) \ + (TO).var = size_binop (MINUS_EXPR, ssize_int (0), \ + fold_convert (ssizetype, dec)); \ + else \ + (TO).var = size_binop (MINUS_EXPR, (TO).var, \ + fold_convert (ssizetype, dec)); \ } while (0) /* Convert the implicit sum in a `struct args_size' into a tree of type ssizetype. */ #define ARGS_SIZE_TREE(SIZE) \ ((SIZE).var == 0 ? ssize_int ((SIZE).constant) \ - : size_binop (PLUS_EXPR, convert (ssizetype, (SIZE).var), \ + : size_binop (PLUS_EXPR, fold_convert (ssizetype, (SIZE).var), \ ssize_int ((SIZE).constant))) /* Convert the implicit sum in a `struct args_size' into an rtx. */ |