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

re PR middle-end/47370 (error: invalid first operand of MEM_REF) 

2011-01-20  Richard Guenther  <rguenther@suse.de>

	PR middle-end/47370
	* tree-inline.c (remap_gimple_op_r): Recurse manually for
	the pointer operand of MEM_REFs.

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

From-SVN: r169055
This commit is contained in:
Richard Guenther 2011-01-20 14:42:20 +00:00 committed by Richard Biener
parent 28fc44f389
commit 93e452edc6
4 changed files with 75 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2011-01-20 Richard Guenther <rguenther@suse.de>
PR middle-end/47370
* tree-inline.c (remap_gimple_op_r): Recurse manually for
the pointer operand of MEM_REFs.
2011-01-20 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/46130

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-01-20 Richard Guenther <rguenther@suse.de>
PR middle-end/47370
* gcc.dg/torture/pr47370.c: New testcase.
2011-01-20 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/46130

27
gcc/testsuite/gcc.dg/torture/pr47370.c Normal file
View File

@ -0,0 +1,27 @@
/* { dg-do compile } */
struct S { int s; };
void
foo (void)
{
for (;;)
;
}
struct S
bar (void)
{
struct S s = { 99 };
return s;
}
void
baz (int i)
{
struct S s[1];
s[0] = bar ();
bar ();
foo ();
}

84
gcc/tree-inline.c
View File

@ -811,57 +811,47 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data)
knows not to copy VAR_DECLs, etc., so this is safe. */
if (TREE_CODE (*tp) == MEM_REF)
{
tree ptr = TREE_OPERAND (*tp, 0);
tree old = *tp;
tree tem;
/* We need to re-canonicalize MEM_REFs from inline substitutions
that can happen when a pointer argument is an ADDR_EXPR. */
tree decl = TREE_OPERAND (*tp, 0);
tree *n;
/* See remap_ssa_name. */
if (TREE_CODE (decl) == SSA_NAME
&& TREE_CODE (SSA_NAME_VAR (decl)) == RESULT_DECL
&& id->transform_return_to_modify)
decl = SSA_NAME_VAR (decl);
n = (tree *) pointer_map_contains (id->decl_map, decl);
if (n)
that can happen when a pointer argument is an ADDR_EXPR.
Recurse here manually to allow that. */
walk_tree (&ptr, remap_gimple_op_r, data, NULL);
if ((tem = maybe_fold_offset_to_reference (EXPR_LOCATION (*tp),
ptr,
TREE_OPERAND (*tp, 1),
TREE_TYPE (*tp)))
&& TREE_THIS_VOLATILE (tem) == TREE_THIS_VOLATILE (old))
{
tree old = *tp;
tree ptr = unshare_expr (*n);
tree tem;
if ((tem = maybe_fold_offset_to_reference (EXPR_LOCATION (*tp),
ptr,
TREE_OPERAND (*tp, 1),
TREE_TYPE (*tp)))
&& TREE_THIS_VOLATILE (tem) == TREE_THIS_VOLATILE (old))
{
tree *tem_basep = &tem;
while (handled_component_p (*tem_basep))
tem_basep = &TREE_OPERAND (*tem_basep, 0);
if (TREE_CODE (*tem_basep) == MEM_REF)
*tem_basep
= build2 (MEM_REF, TREE_TYPE (*tem_basep),
TREE_OPERAND (*tem_basep, 0),
fold_convert (TREE_TYPE (TREE_OPERAND (*tp, 1)),
TREE_OPERAND (*tem_basep, 1)));
else
*tem_basep
= build2 (MEM_REF, TREE_TYPE (*tem_basep),
build_fold_addr_expr (*tem_basep),
build_int_cst
(TREE_TYPE (TREE_OPERAND (*tp, 1)), 0));
*tp = tem;
}
tree *tem_basep = &tem;
while (handled_component_p (*tem_basep))
tem_basep = &TREE_OPERAND (*tem_basep, 0);
if (TREE_CODE (*tem_basep) == MEM_REF)
*tem_basep
= build2 (MEM_REF, TREE_TYPE (*tem_basep),
TREE_OPERAND (*tem_basep, 0),
fold_convert (TREE_TYPE (TREE_OPERAND (*tp, 1)),
TREE_OPERAND (*tem_basep, 1)));
else
{
*tp = fold_build2 (MEM_REF, TREE_TYPE (*tp),
ptr, TREE_OPERAND (*tp, 1));
TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old);
TREE_THIS_NOTRAP (*tp) = TREE_THIS_NOTRAP (old);
}
TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old);
*walk_subtrees = 0;
return NULL;
*tem_basep
= build2 (MEM_REF, TREE_TYPE (*tem_basep),
build_fold_addr_expr (*tem_basep),
build_int_cst
(TREE_TYPE (TREE_OPERAND (*tp, 1)), 0));
*tp = tem;
}
else
{
*tp = fold_build2 (MEM_REF, TREE_TYPE (*tp),
ptr, TREE_OPERAND (*tp, 1));
TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old);
TREE_THIS_NOTRAP (*tp) = TREE_THIS_NOTRAP (old);
}
TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old);
*walk_subtrees = 0;
return NULL;
}
/* Here is the "usual case". Copy this tree node, and then