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

re PR middle-end/33122 (Mistaken type mismatch error prevents bootstrap)

Browse source 
2007-08-21  Richard Guenther  <rguenther@suse.de>

	PR middle-end/33122
	* fold-const.c (fold_binary): Remove index +p PTR folding.
	Fix types of POINTER_PLUS_EXPR generated by folding of
	(PTR +p B) +p A.

        * gcc.c-torture/compile/pr33122.c: New testcase.

From-SVN: r127659
This commit is contained in:
Richard Guenther 2007-08-21 08:23:50 +00:00 • committed by Richard Biener
parent 66644666a5
commit 8015455a87
4 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/ChangeLog
View file

@ -1,3 +1,10 @@
2007-08-21 Richard Guenther <rguenther@suse.de>
PR middle-end/33122
* fold-const.c (fold_binary): Remove index +p PTR folding.
Fix types of POINTER_PLUS_EXPR generated by folding of
(PTR +p B) +p A.
2007-08-20 Chao-ying Fu <fu@mips.com>
* c-common.h (enum rid): Add new enumeration values of RID_SAT,

14
gcc/fold-const.c
View file

@ -9528,20 +9528,17 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
fold_convert (sizetype, arg1),
fold_convert (sizetype, arg0)));
/* index +p PTR -> PTR +p index */
if (POINTER_TYPE_P (TREE_TYPE (arg1))
&& INTEGRAL_TYPE_P (TREE_TYPE (arg0)))
return fold_build2 (POINTER_PLUS_EXPR, type,
fold_convert (type, arg1), fold_convert (sizetype, arg0));
/* (PTR +p B) +p A -> PTR +p (B + A) */
if (TREE_CODE (arg0) == POINTER_PLUS_EXPR)
{
tree inner;
tree arg01 = fold_convert (sizetype, TREE_OPERAND (arg0, 1));
tree arg00 = TREE_OPERAND (arg0, 0);
inner = fold_build2 (PLUS_EXPR, sizetype, arg01, fold_convert (sizetype, arg1));
return fold_build2 (POINTER_PLUS_EXPR, type, arg00, inner);
inner = fold_build2 (PLUS_EXPR, sizetype,
arg01, fold_convert (sizetype, arg1));
return fold_convert (type,
fold_build2 (POINTER_PLUS_EXPR,
TREE_TYPE (arg00), arg00, inner));
}
/* PTR_CST +p CST -> CST1 */
@ -9559,6 +9556,7 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
}
return NULL_TREE;
case PLUS_EXPR:
/* PTR + INT -> (INT)(PTR p+ INT) */
if (POINTER_TYPE_P (TREE_TYPE (arg0))

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2007-08-21 Richard Guenther <rguenther@suse.de>
PR middle-end/33122
* gcc.c-torture/compile/pr33122.c: New testcase.
2007-03-20 Pawel Sikora <pluto@pld-linux.org>
* g++.dg/warn/Wnvdtor-2.C: New testcase.

14
gcc/testsuite/gcc.c-torture/compile/pr33122.c Normal file
View file

@ -0,0 +1,14 @@
struct dis386 {
const char *x;
};
static const struct dis386 float_reg[][2] = {
{ { "fadd" }, { "fadd" } },
};
void foo(int i, int j)
{
const struct dis386 *dp;
dp = &float_reg[i - 1][j];
}