Skip to content

R
riscv-gcc-1
Commit fdad69c1 by Richard Guenther Committed by Richard Biener
Options

re PR tree-optimization/51528 (SRA should not create BOOLEAN_TYPE replacements) 

2012-01-30  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/51528
	* tree-sra.c (sra_modify_assign): Re-factor in preparation
	for PR51528 fix.

From-SVN: r183720
parent 8203ac49
Showing with 48 additions and 45 deletions
gcc/ChangeLog
2012-01-30 Richard Guenther <rguenther@suse.de>
PR tree-optimization/51528
* tree-sra.c (sra_modify_assign): Re-factor in preparation
for PR51528 fix.
2012-01-30 Paolo Bonzini <bonzini@gnu.org>
* df-problems.c (df_kill_notes): Check that the use refers
......
gcc/tree-sra.c
......@@ -2991,6 +2991,16 @@ sra_modify_assign (gimple *stmt, gimple_stmt_iterator *gsi)
force_gimple_rhs = true;
sra_stats.exprs++;
}
else if (racc
&& !access_has_children_p (racc)
&& !racc->grp_to_be_replaced
&& !racc->grp_unscalarized_data
&& TREE_CODE (lhs) == SSA_NAME)
{
rhs = get_repl_default_def_ssa_name (racc);
modify_this_stmt = true;
sra_stats.exprs++;
}
if (modify_this_stmt)
{
......@@ -3067,6 +3077,21 @@ sra_modify_assign (gimple *stmt, gimple_stmt_iterator *gsi)
generate_subtree_copies (lacc->first_child, lacc->base, 0, 0, 0,
gsi, true, true, loc);
sra_stats.separate_lhs_rhs_handling++;
/* This gimplification must be done after generate_subtree_copies,
lest we insert the subtree copies in the middle of the gimplified
sequence. */
if (force_gimple_rhs)
rhs = force_gimple_operand_gsi (&orig_gsi, rhs, true, NULL_TREE,
true, GSI_SAME_STMT);
if (gimple_assign_rhs1 (*stmt) != rhs)
{
modify_this_stmt = true;
gimple_assign_set_rhs_from_tree (&orig_gsi, rhs);
gcc_assert (*stmt == gsi_stmt (orig_gsi));
}
return modify_this_stmt ? SRA_AM_MODIFIED : SRA_AM_NONE;
}
else
{
......@@ -3093,61 +3118,33 @@ sra_modify_assign (gimple *stmt, gimple_stmt_iterator *gsi)
}
else
{
if (racc)
if (access_has_children_p (racc)
&& !racc->grp_unscalarized_data)
{
if (!racc->grp_to_be_replaced && !racc->grp_unscalarized_data)
if (dump_file)
{
if (dump_file)
{
fprintf (dump_file, "Removing load: ");
print_gimple_stmt (dump_file, *stmt, 0, 0);
}
if (TREE_CODE (lhs) == SSA_NAME)
{
rhs = get_repl_default_def_ssa_name (racc);
if (!useless_type_conversion_p (TREE_TYPE (lhs),
TREE_TYPE (rhs)))
rhs = fold_build1_loc (loc, VIEW_CONVERT_EXPR,
TREE_TYPE (lhs), rhs);
}
else
{
if (racc->first_child)
generate_subtree_copies (racc->first_child, lhs,
racc->offset, 0, 0, gsi,
false, false, loc);
gcc_assert (*stmt == gsi_stmt (*gsi));
unlink_stmt_vdef (*stmt);
gsi_remove (gsi, true);
sra_stats.deleted++;
return SRA_AM_REMOVED;
}
fprintf (dump_file, "Removing load: ");
print_gimple_stmt (dump_file, *stmt, 0, 0);
}
else if (racc->first_child)
generate_subtree_copies (racc->first_child, lhs, racc->offset,
0, 0, gsi, false, true, loc);
generate_subtree_copies (racc->first_child, lhs,
racc->offset, 0, 0, gsi,
false, false, loc);
gcc_assert (*stmt == gsi_stmt (*gsi));
unlink_stmt_vdef (*stmt);
gsi_remove (gsi, true);
sra_stats.deleted++;
return SRA_AM_REMOVED;
}
if (access_has_children_p (racc))
generate_subtree_copies (racc->first_child, lhs, racc->offset,
0, 0, gsi, false, true, loc);
if (access_has_children_p (lacc))
generate_subtree_copies (lacc->first_child, rhs, lacc->offset,
0, 0, gsi, true, true, loc);
}
}
/* This gimplification must be done after generate_subtree_copies, lest we
insert the subtree copies in the middle of the gimplified sequence. */
if (force_gimple_rhs)
rhs = force_gimple_operand_gsi (&orig_gsi, rhs, true, NULL_TREE,
true, GSI_SAME_STMT);
if (gimple_assign_rhs1 (*stmt) != rhs)
{
modify_this_stmt = true;
gimple_assign_set_rhs_from_tree (&orig_gsi, rhs);
gcc_assert (*stmt == gsi_stmt (orig_gsi));
return SRA_AM_NONE;
}
return modify_this_stmt ? SRA_AM_MODIFIED : SRA_AM_NONE;
}
/* Traverse the function body and all modifications as decided in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment