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

* c-common.c (pointer_int_sum): Fold the MULT_EXPR.

Browse source 
From-SVN: r229500
This commit is contained in:
Jason Merrill 2015-10-28 14:54:48 -04:00 • committed by Jason Merrill
parent a6392fdc0b
commit d90ec4f2bc
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/c-family/ChangeLog
View file

@ -1,3 +1,7 @@
2015-10-28 Jason Merrill <jason@redhat.com>
* c-common.c (pointer_int_sum): Fold the MULT_EXPR.
2015-10-27 Thomas Schwinge <thomas@codesourcery.com>
James Norris <jnorris@codesourcery.com>
Cesar Philippidis <cesar@codesourcery.com>

5
gcc/c-family/c-common.c
View file

@ -4849,9 +4849,8 @@ pointer_int_sum (location_t loc, enum tree_code resultcode,
for the pointer operation and disregard an overflow that occurred only
because of the sign-extension change in the latter conversion. */
{
tree t = build_binary_op (loc,
MULT_EXPR, intop,
convert (TREE_TYPE (intop), size_exp), 1);
tree t = fold_build2_loc (loc, MULT_EXPR, TREE_TYPE (intop), intop,
convert (TREE_TYPE (intop), size_exp));
intop = convert (sizetype, t);
if (TREE_OVERFLOW_P (intop) && !TREE_OVERFLOW (t))
intop = wide_int_to_tree (TREE_TYPE (intop), intop);

7
gcc/testsuite/gcc.dg/pointer-arith-10.c
View file

@ -6,4 +6,9 @@ char *foo(char *p, __UINTPTR_TYPE__ i)
return (char *)i + (__UINTPTR_TYPE__)p;
}
/* { dg-final { scan-tree-dump "p +" "original" } } */
/* Check that we use a POINTER_PLUS_EXPR, not something like
return (char *) ((sizetype) p + (sizetype) i); */
/* { dg-final { scan-tree-dump-not "sizetype.*sizetype" "original" } } */
/* And also that we don't swap the operands. */
/* { dg-final { scan-tree-dump-not "return p +" "original" } } */