diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-29 13:11:18 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-29 13:11:18 +0000 |
| commit | b3d480fb6aea674b3f3ed68dd2c87509b7d5e978 (patch) | |
| tree | 9944088576a00cf7b79e01597771ae2db283896d /gcc | |
| parent | d534cab00feb1d9fff39265c960d143d31ee0635 (diff) | |
| download | gcc-b3d480fb6aea674b3f3ed68dd2c87509b7d5e978.tar.gz | |
2011-04-29 Richard Guenther <rguenther@suse.de>
* tree-inline.c (remap_eh_region_tree_nr): Use integer_type_node
for the remapped region number.
* predict.c (build_predict_expr): Use integer_type_node for the
predict kind.
* fold-const.c (fold_binary_loc): Use integer_type_node for
the shift amount. Use a proper type for the PLUS_EXPR operand.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173156 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fold-const.c | 6 | ||||
| -rw-r--r-- | gcc/predict.c | 2 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6f7430c1483..2d32ac43d5b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2011-04-29 Richard Guenther <rguenther@suse.de> + + * tree-inline.c (remap_eh_region_tree_nr): Use integer_type_node + for the remapped region number. + * predict.c (build_predict_expr): Use integer_type_node for the + predict kind. + * fold-const.c (fold_binary_loc): Use integer_type_node for + the shift amount. Use a proper type for the PLUS_EXPR operand. + 2011-04-29 Michael Matz <matz@suse.de> * lto-streamer.c (lto_streamer_cache_insert_1): Accept to override diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 1aa0dec0011..1daebbd3ad8 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -11533,7 +11533,7 @@ fold_binary_loc (location_t loc, return fold_build2_loc (loc, RSHIFT_EXPR, type, TREE_OPERAND (arg0, 0), - build_int_cst (NULL_TREE, pow2)); + build_int_cst (integer_type_node, pow2)); } } @@ -11565,7 +11565,9 @@ fold_binary_loc (location_t loc, WARN_STRICT_OVERFLOW_MISC); sh_cnt = fold_build2_loc (loc, PLUS_EXPR, TREE_TYPE (sh_cnt), - sh_cnt, build_int_cst (NULL_TREE, pow2)); + sh_cnt, + build_int_cst (TREE_TYPE (sh_cnt), + pow2)); return fold_build2_loc (loc, RSHIFT_EXPR, type, fold_convert_loc (loc, type, arg0), sh_cnt); } diff --git a/gcc/predict.c b/gcc/predict.c index db9c5c5a8fe..e18f9379c3f 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -2291,7 +2291,7 @@ tree build_predict_expr (enum br_predictor predictor, enum prediction taken) { tree t = build1 (PREDICT_EXPR, void_type_node, - build_int_cst (NULL, predictor)); + build_int_cst (integer_type_node, predictor)); SET_PREDICT_EXPR_OUTCOME (t, taken); return t; } diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 440699f7719..5da4a12d9ad 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1204,7 +1204,7 @@ remap_eh_region_tree_nr (tree old_t_nr, copy_body_data *id) old_nr = tree_low_cst (old_t_nr, 0); new_nr = remap_eh_region_nr (old_nr, id); - return build_int_cst (NULL, new_nr); + return build_int_cst (integer_type_node, new_nr); } /* Helper for copy_bb. Remap statement STMT using the inlining |