diff options
| author | Andreas Krebbel <krebbel1@de.ibm.com> | 2009-06-24 07:01:24 +0000 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@gcc.gnu.org> | 2009-06-24 07:01:24 +0000 |
| commit | fb6234e0f88b9623472927b15277da9f3c54518e (patch) | |
| tree | 21889fd7e866f0af3eba04364725b46506ef9e95 /gcc/tree-ssa-math-opts.c | |
| parent | 7acf4da6f94801cb3146709fc0ae310ac475a274 (diff) | |
| download | gcc-fb6234e0f88b9623472927b15277da9f3c54518e.zip gcc-fb6234e0f88b9623472927b15277da9f3c54518e.tar.gz gcc-fb6234e0f88b9623472927b15277da9f3c54518e.tar.bz2 | |
re PR middle-end/40501 (error: invalid conversion in gimple call)
2009-06-24 Andreas Krebbel <krebbel1@de.ibm.com>
PR middle-end/40501
* tree-ssa-math-opts.c (execute_optimize_bswap): Convert the bswap
src and dst operands if necessary.
2009-06-24 Andreas Krebbel <krebbel1@de.ibm.com>
* gcc.dg/pr40501.c: New testcase.
From-SVN: r148892
Diffstat (limited to 'gcc/tree-ssa-math-opts.c')
| -rw-r--r-- | gcc/tree-ssa-math-opts.c | 65 |
1 files changed, 60 insertions, 5 deletions
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c index 20ddbad..11ce546 100644 --- a/gcc/tree-ssa-math-opts.c +++ b/gcc/tree-ssa-math-opts.c @@ -1164,6 +1164,7 @@ execute_optimize_bswap (void) basic_block bb; bool bswap32_p, bswap64_p; bool changed = false; + tree bswap32_type = NULL_TREE, bswap64_type = NULL_TREE; if (BITS_PER_UNIT != 8) return 0; @@ -1181,6 +1182,20 @@ execute_optimize_bswap (void) if (!bswap32_p && !bswap64_p) return 0; + /* Determine the argument type of the builtins. The code later on + assumes that the return and argument type are the same. */ + if (bswap32_p) + { + tree fndecl = built_in_decls[BUILT_IN_BSWAP32]; + bswap32_type = TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (fndecl))); + } + + if (bswap64_p) + { + tree fndecl = built_in_decls[BUILT_IN_BSWAP64]; + bswap64_type = TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (fndecl))); + } + FOR_EACH_BB (bb) { gimple_stmt_iterator gsi; @@ -1188,7 +1203,8 @@ execute_optimize_bswap (void) for (gsi = gsi_after_labels (bb); !gsi_end_p (gsi); gsi_next (&gsi)) { gimple stmt = gsi_stmt (gsi); - tree bswap_src; + tree bswap_src, bswap_type; + tree bswap_tmp; tree fndecl = NULL_TREE; int type_size; gimple call; @@ -1203,11 +1219,17 @@ execute_optimize_bswap (void) { case 32: if (bswap32_p) - fndecl = built_in_decls[BUILT_IN_BSWAP32]; + { + fndecl = built_in_decls[BUILT_IN_BSWAP32]; + bswap_type = bswap32_type; + } break; case 64: if (bswap64_p) - fndecl = built_in_decls[BUILT_IN_BSWAP64]; + { + fndecl = built_in_decls[BUILT_IN_BSWAP64]; + bswap_type = bswap64_type; + } break; default: continue; @@ -1222,8 +1244,41 @@ execute_optimize_bswap (void) continue; changed = true; - call = gimple_build_call (fndecl, 1, bswap_src); - gimple_call_set_lhs (call, gimple_assign_lhs (stmt)); + + bswap_tmp = bswap_src; + + /* Convert the src expression if necessary. */ + if (!useless_type_conversion_p (TREE_TYPE (bswap_tmp), bswap_type)) + { + gimple convert_stmt; + + bswap_tmp = create_tmp_var (bswap_type, "bswapsrc"); + add_referenced_var (bswap_tmp); + bswap_tmp = make_ssa_name (bswap_tmp, NULL); + + convert_stmt = gimple_build_assign_with_ops ( + CONVERT_EXPR, bswap_tmp, bswap_src, NULL); + gsi_insert_before (&gsi, convert_stmt, GSI_SAME_STMT); + } + + call = gimple_build_call (fndecl, 1, bswap_tmp); + + bswap_tmp = gimple_assign_lhs (stmt); + + /* Convert the result if necessary. */ + if (!useless_type_conversion_p (TREE_TYPE (bswap_tmp), bswap_type)) + { + gimple convert_stmt; + + bswap_tmp = create_tmp_var (bswap_type, "bswapdst"); + add_referenced_var (bswap_tmp); + bswap_tmp = make_ssa_name (bswap_tmp, NULL); + convert_stmt = gimple_build_assign_with_ops ( + CONVERT_EXPR, gimple_assign_lhs (stmt), bswap_tmp, NULL); + gsi_insert_after (&gsi, convert_stmt, GSI_SAME_STMT); + } + + gimple_call_set_lhs (call, bswap_tmp); if (dump_file) { |