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

re PR other/44038 (ICE: verify_stmts failed)

Browse Source 
2010-05-15  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/44038
	* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Avoid
	taking the address of a V_C_E of a constant.

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

From-SVN: r159434
This commit is contained in:
Richard Guenther 2010-05-15 15:06:47 +00:00 committed by Richard Biener
parent 75d2d58156
commit 9d0baae10e
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2010-05-15 Richard Guenther <rguenther@suse.de>
PR tree-optimization/44038
* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Avoid
taking the address of a V_C_E of a constant.
2010-05-14 Jan Hubicka <jh@suse.cz> 2010-05-14 Jan Hubicka <jh@suse.cz>
* tree.h (memory_identifier_string): Remove. * tree.h (memory_identifier_string): Remove.

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-15 Richard Guenther <rguenther@suse.de>
PR tree-optimization/44038
* gcc.c-torture/compile/pr44038.c: New testcase.
2010-05-15 H.J. Lu <hongjiu.lu@intel.com> 2010-05-15 H.J. Lu <hongjiu.lu@intel.com>
* gcc.target/i386/avx-cmpsd-1.c: Add -std=c99. * gcc.target/i386/avx-cmpsd-1.c: Add -std=c99.

13
gcc/testsuite/gcc.c-torture/compile/pr44038.c Normal file
View File

@ -0,0 +1,13 @@
struct Ustr {
char data[1];
};
int ustr_xi__embed_val_get(char *);
inline static int ustr_len(struct Ustr *s1)
{
return ustr_xi__embed_val_get(s1->data);
}
static struct Ustr *s1 = ((struct Ustr *) "");
int tst(char *cstr)
{
return ustr_len(s1);
}

16
gcc/tree-ssa-forwprop.c
View File

@ -730,6 +730,7 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs,
gimple use_stmt = gsi_stmt (*use_stmt_gsi); gimple use_stmt = gsi_stmt (*use_stmt_gsi);
enum tree_code rhs_code; enum tree_code rhs_code;
bool res = true; bool res = true;
bool addr_p = false;
gcc_assert (TREE_CODE (def_rhs) == ADDR_EXPR); gcc_assert (TREE_CODE (def_rhs) == ADDR_EXPR);
@ -802,8 +803,12 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs,
/* Strip away any outer COMPONENT_REF, ARRAY_REF or ADDR_EXPR /* Strip away any outer COMPONENT_REF, ARRAY_REF or ADDR_EXPR
nodes from the RHS. */ nodes from the RHS. */
rhsp = gimple_assign_rhs1_ptr (use_stmt); rhsp = gimple_assign_rhs1_ptr (use_stmt);
while (handled_component_p (*rhsp) if (TREE_CODE (*rhsp) == ADDR_EXPR)
|| TREE_CODE (*rhsp) == ADDR_EXPR) {
rhsp = &TREE_OPERAND (*rhsp, 0);
addr_p = true;
}
while (handled_component_p (*rhsp))
rhsp = &TREE_OPERAND (*rhsp, 0); rhsp = &TREE_OPERAND (*rhsp, 0);
rhs = *rhsp; rhs = *rhsp;
@ -852,11 +857,14 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs,
return res; return res;
} }
/* If the defining rhs comes from an indirect reference, then do not /* If the defining rhs comes from an indirect reference, then do not
convert into a VIEW_CONVERT_EXPR. */ convert into a VIEW_CONVERT_EXPR. Likewise if we'll end up taking
the address of a V_C_E of a constant. */
def_rhs_base = TREE_OPERAND (def_rhs, 0); def_rhs_base = TREE_OPERAND (def_rhs, 0);
while (handled_component_p (def_rhs_base)) while (handled_component_p (def_rhs_base))
def_rhs_base = TREE_OPERAND (def_rhs_base, 0); def_rhs_base = TREE_OPERAND (def_rhs_base, 0);
if (!INDIRECT_REF_P (def_rhs_base)) if (!INDIRECT_REF_P (def_rhs_base)
&& (!addr_p
|| !is_gimple_min_invariant (def_rhs)))
{ {
/* We may have arbitrary VIEW_CONVERT_EXPRs in a nested component /* We may have arbitrary VIEW_CONVERT_EXPRs in a nested component
reference. Place it there and fold the thing. */ reference. Place it there and fold the thing. */