OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR middle-end/48953 (ICE: verify_gimple failed: type mismatch in array reference with -flto and struct with vararray) 

2011-05-11  Richard Guenther  <rguenther@suse.de>

	PR middle-end/48953
	* tree-inline.c (remap_gimple_op_r): Also remap types of MEM_REFs.

	* gcc.dg/torture/pr48953.c: New testcase.

From-SVN: r173653
This commit is contained in:
Richard Guenther 2011-05-11 12:23:12 +00:00 committed by Richard Biener
parent e9f8dcf9b3
commit 41a58a92c3
4 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-11 Richard Guenther <rguenther@suse.de>
PR middle-end/48953
* tree-inline.c (remap_gimple_op_r): Also remap types of MEM_REFs.
2011-05-11 Joseph Myers <joseph@codesourcery.com>
* opts.c (finish_options): Move warning settings from

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-11 Richard Guenther <rguenther@suse.de>
PR middle-end/48953
* gcc.dg/torture/pr48953.c: New testcase.
2011-05-11 Richard Guenther <rguenther@suse.de>
PR tree-optimization/18041

17
gcc/testsuite/gcc.dg/torture/pr48953.c Normal file
View File

@ -0,0 +1,17 @@
/* { dg-do run } */
/* { dg-options "-fno-tree-dce" } */
static inline int foo (int n, int k)
{
struct S
{
int i[n];
int value;
} s[2];
return s[k].value = 0;
}
int main ()
{
return foo (2, 0);
}

20
gcc/tree-inline.c
View File

@ -811,9 +811,15 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data)
{
/* Otherwise, just copy the node. Note that copy_tree_r already
knows not to copy VAR_DECLs, etc., so this is safe. */
/* We should never have TREE_BLOCK set on non-statements. */
if (EXPR_P (*tp))
gcc_assert (!TREE_BLOCK (*tp));
if (TREE_CODE (*tp) == MEM_REF)
{
tree ptr = TREE_OPERAND (*tp, 0);
tree type = remap_type (TREE_TYPE (*tp), id);
tree old = *tp;
tree tem;
@ -824,7 +830,7 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data)
if ((tem = maybe_fold_offset_to_reference (EXPR_LOCATION (*tp),
ptr,
TREE_OPERAND (*tp, 1),
TREE_TYPE (*tp)))
type))
&& TREE_THIS_VOLATILE (tem) == TREE_THIS_VOLATILE (old))
{
tree *tem_basep = &tem;
@ -846,7 +852,7 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data)
}
else
{
*tp = fold_build2 (MEM_REF, TREE_TYPE (*tp),
*tp = fold_build2 (MEM_REF, type,
ptr, TREE_OPERAND (*tp, 1));
TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old);
TREE_THIS_NOTRAP (*tp) = TREE_THIS_NOTRAP (old);
@ -860,6 +866,9 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data)
tweak some special cases. */
copy_tree_r (tp, walk_subtrees, NULL);
if (TREE_CODE (*tp) != OMP_CLAUSE)
TREE_TYPE (*tp) = remap_type (TREE_TYPE (*tp), id);
/* Global variables we haven't seen yet need to go into referenced
vars. If not referenced from types only. */
if (gimple_in_ssa_p (cfun)
@ -868,13 +877,6 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data)
&& !processing_debug_stmt)
add_referenced_var (*tp);
/* We should never have TREE_BLOCK set on non-statements. */
if (EXPR_P (*tp))
gcc_assert (!TREE_BLOCK (*tp));
if (TREE_CODE (*tp) != OMP_CLAUSE)
TREE_TYPE (*tp) = remap_type (TREE_TYPE (*tp), id);
if (TREE_CODE (*tp) == TARGET_EXPR && TREE_OPERAND (*tp, 3))
{
/* The copied TARGET_EXPR has never been expanded, even if the