procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow more complex call replacements in gimple-fold.c

Browse source 
An upcoming patch adds a match.pd rule that folds pow(pow(x,y),z)
to pow(x,y*z).  This fold can reuse the existing pow gimple statement
and simply replace the operands with x and y*z.  However, the y*z
itself requires a separate gimple statement and the code wasn't
prepared to handle that.

Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi.

gcc/
	* gimple-fold.c (replace_stmt_with_simplification): Don't allow
	new statements to be inserted if inplace.  Allow calls to have
	nonempty sequences.

From-SVN: r229371
This commit is contained in:
Richard Sandiford 2015-10-26 14:59:36 +00:00 • committed by Richard Sandiford
parent 0b7c37ee71
commit fec40d06da
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/ChangeLog
View file

@ -1,3 +1,9 @@
2015-10-26 Richard Sandiford <richard.sandiford@arm.com>
* gimple-fold.c (replace_stmt_with_simplification): Don't allow
new statements to be inserted if inplace. Allow calls to have
nonempty sequences.
2015-10-26 Richard Biener <rguenther@suse.de> 2015-10-26 Richard Biener <rguenther@suse.de>
* tree-object-size.c: Remove builtins.h include, include tree-cfg.h. * tree-object-size.c: Remove builtins.h include, include tree-cfg.h.

14
gcc/gimple-fold.c
View file

@ -3289,6 +3289,11 @@ replace_stmt_with_simplification (gimple_stmt_iterator *gsi,
&& !has_use_on_stmt (ops[2], stmt))) && !has_use_on_stmt (ops[2], stmt)))
return false; return false;
/* Don't insert new statements when INPLACE is true, even if we could
reuse STMT for the final statement. */
if (inplace && !gimple_seq_empty_p (*seq))
return false;
if (gcond *cond_stmt = dyn_cast <gcond *> (stmt)) if (gcond *cond_stmt = dyn_cast <gcond *> (stmt))
{ {
gcc_assert (rcode.is_tree_code ()); gcc_assert (rcode.is_tree_code ());
@ -3365,7 +3370,14 @@ replace_stmt_with_simplification (gimple_stmt_iterator *gsi,
} }
if (i < 3) if (i < 3)
gcc_assert (ops[i] == NULL_TREE); gcc_assert (ops[i] == NULL_TREE);
gcc_assert (gimple_seq_empty_p (*seq)); if (dump_file && (dump_flags & TDF_DETAILS))
{
fprintf (dump_file, "gimple_simplified to ");
if (!gimple_seq_empty_p (*seq))
print_gimple_seq (dump_file, *seq, 0, TDF_SLIM);
print_gimple_stmt (dump_file, gsi_stmt (*gsi), 0, TDF_SLIM);
}
gsi_insert_seq_before (gsi, *seq, GSI_SAME_STMT);
return true; return true;
} }
else if (!inplace) else if (!inplace)