diff options
| author | Richard Guenther <rguenther@suse.de> | 2009-04-15 16:12:01 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2009-04-15 16:12:01 +0000 |
| commit | ada39f0b23c61dd0c3acc45c73910b07c9fc03f3 (patch) | |
| tree | df6e6b24e71dfa49774871537c516ac031b4d427 /gcc/tree-loop-distribution.c | |
| parent | 6866c6e8ff0cbc1d57f9ae603b5af155def03484 (diff) | |
| download | gcc-ada39f0b23c61dd0c3acc45c73910b07c9fc03f3.tar.gz | |
omp-low.c (lower_rec_input_clauses): Build correct address expressions.
2009-04-15 Richard Guenther <rguenther@suse.de>
* omp-low.c (lower_rec_input_clauses): Build correct address
expressions.
(expand_omp_for_generic): Fix multiplication type.
* tree-loop-distribution.c (build_size_arg): Build a
size_t argument.
(generate_memset_zero): Fix types.
* tree-profile.c (prepare_instrumented_value): Correctly
widen a pointer.
From-SVN: r146129
Diffstat (limited to 'gcc/tree-loop-distribution.c')
| -rw-r--r-- | gcc/tree-loop-distribution.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c index 61762971c7c..a5c73165cb4 100644 --- a/gcc/tree-loop-distribution.c +++ b/gcc/tree-loop-distribution.c @@ -216,7 +216,7 @@ generate_loops_for_partition (struct loop *loop, bitmap partition, bool copy_p) return true; } -/* Build size argument. */ +/* Build the size argument for a memset call. */ static inline tree build_size_arg (tree nb_iter, tree op, gimple_seq* stmt_list) @@ -224,8 +224,10 @@ build_size_arg (tree nb_iter, tree op, gimple_seq* stmt_list) tree nb_bytes; gimple_seq stmts = NULL; - nb_bytes = fold_build2 (MULT_EXPR, TREE_TYPE (nb_iter), - nb_iter, TYPE_SIZE_UNIT (TREE_TYPE (op))); + nb_bytes = fold_build2 (MULT_EXPR, size_type_node, + fold_convert (size_type_node, nb_iter), + fold_convert (size_type_node, + TYPE_SIZE_UNIT (TREE_TYPE (op)))); nb_bytes = force_gimple_operand (nb_bytes, &stmts, true, NULL); gimple_seq_add_seq (stmt_list, stmts); @@ -272,7 +274,8 @@ generate_memset_zero (gimple stmt, tree op0, tree nb_iter, { nb_bytes = build_size_arg (nb_iter, op0, &stmt_list); addr_base = size_binop (PLUS_EXPR, DR_OFFSET (dr), DR_INIT (dr)); - addr_base = fold_build2 (MINUS_EXPR, sizetype, addr_base, nb_bytes); + addr_base = fold_build2 (MINUS_EXPR, sizetype, addr_base, + fold_convert (sizetype, nb_bytes)); addr_base = force_gimple_operand (addr_base, &stmts, true, NULL); gimple_seq_add_seq (&stmt_list, stmts); @@ -291,7 +294,7 @@ generate_memset_zero (gimple stmt, tree op0, tree nb_iter, fn = build1 (ADDR_EXPR, build_pointer_type (fntype), fndecl); if (!nb_bytes) - nb_bytes = build_size_arg (nb_iter, op0, &stmt_list); + nb_bytes = build_size_arg (nb_iter, op0, &stmt_list); fn_call = gimple_build_call (fn, 3, mem, integer_zero_node, nb_bytes); gimple_seq_add_stmt (&stmt_list, fn_call); |