procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR middle-end/40501 (error: invalid conversion in gimple call)

Browse source 
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
This commit is contained in:
Andreas Krebbel 2009-06-24 07:01:24 +00:00 • committed by Andreas Krebbel
parent 7acf4da6f9
commit fb6234e0f8
4 changed files with 94 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/ChangeLog
View file

@ -1,3 +1,9 @@
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-23 DJ Delorie <dj@redhat.com>
Add MeP port.

4
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
2009-06-24 Andreas Krebbel <krebbel1@de.ibm.com>
* gcc.dg/pr40501.c: New testcase.
2009-06-23 DJ Delorie <dj@redhat.com>
Add MeP port.

24
gcc/testsuite/gcc.dg/pr40501.c Normal file
View file

@ -0,0 +1,24 @@
/* { dg-do compile { target alpha*-*-* ia64*-*-* x86_64-*-* s390x-*-* } } */
/* { dg-options "-O2" } */
/* { dg-require-effective-target lp64 } */
/* PR middle-end/40501 */
/* This once failed due to the bswap pass missing to add the type
casts of the signed argument and result to the proper unsigned
types. */
typedef long int int64_t;
int64_t
swap64 (int64_t n)
{
return (((n & (((int64_t) 0xff) )) << 56) |
((n & (((int64_t) 0xff) << 8)) << 40) |
((n & (((int64_t) 0xff) << 16)) << 24) |
((n & (((int64_t) 0xff) << 24)) << 8) |
((n & (((int64_t) 0xff) << 32)) >> 8) |
((n & (((int64_t) 0xff) << 40)) >> 24) |
((n & (((int64_t) 0xff) << 48)) >> 40) |
((n & (((int64_t) 0xff) << 56)) >> 56));
}

65
gcc/tree-ssa-math-opts.c
View file

@ -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)
{