From 25b6dd9cde22f34790a17ada051b7b89cbcf1123 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 27 Nov 2007 15:00:37 +0000 Subject: re PR middle-end/34241 (ICE in forward_propagate_into_cond) 2007-11-27 Richard Guenther PR tree-optimization/34241 * tree-ssa-forwprop.c (forward_propagate_addr_expr): Make sure to only delete real conversion chains. * g++.dg/torture/pr34241.C: New testcase. From-SVN: r130468 --- gcc/tree-ssa-forwprop.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gcc/tree-ssa-forwprop.c') diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index 3e30454..f368c33 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -685,6 +685,7 @@ forward_propagate_addr_expr (tree name, tree rhs) FOR_EACH_IMM_USE_STMT (use_stmt, iter, name) { bool result; + tree use_rhs; /* If the use is not in a simple assignment statement, then there is nothing we can do. */ @@ -712,11 +713,13 @@ forward_propagate_addr_expr (tree name, tree rhs) pop_stmt_changes (&use_stmt); /* Remove intermediate now unused copy and conversion chains. */ + use_rhs = GIMPLE_STMT_OPERAND (use_stmt, 1); if (result && TREE_CODE (GIMPLE_STMT_OPERAND (use_stmt, 0)) == SSA_NAME - && (TREE_CODE (GIMPLE_STMT_OPERAND (use_stmt, 1)) == SSA_NAME - || TREE_CODE (GIMPLE_STMT_OPERAND (use_stmt, 1)) == NOP_EXPR - || TREE_CODE (GIMPLE_STMT_OPERAND (use_stmt, 1)) == CONVERT_EXPR)) + && (TREE_CODE (use_rhs) == SSA_NAME + || ((TREE_CODE (use_rhs) == NOP_EXPR + || TREE_CODE (use_rhs) == CONVERT_EXPR) + && TREE_CODE (TREE_OPERAND (use_rhs, 0)) == SSA_NAME))) { block_stmt_iterator bsi = bsi_for_stmt (use_stmt); release_defs (use_stmt); -- cgit v1.1