tree-data-ref.c (estimate_niter_from_size_of_data): Replace fold_build2 with fold_binary.

* tree-data-ref.c (estimate_niter_from_size_of_data): Replace
	fold_build2 with fold_binary.
	* tree-ssa-ccp.c (visit_assignment, maybe_fold_stmt_addition):
	Replace fold_build1 with fold_unary.
	* tree-ssa-reassoc.c (optimize_ops_list): Replace fold_build2
	with fold_binary.

From-SVN: r108913
This commit is contained in:
Kazu Hirata 2005-12-21 16:48:59 +00:00 committed by Kazu Hirata
parent ad44e786b8
commit 0dd4b47b7f
4 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,12 @@
2005-12-21 Kazu Hirata <kazu@codesourcery.com>
* tree-data-ref.c (estimate_niter_from_size_of_data): Replace
fold_build2 with fold_binary.
* tree-ssa-ccp.c (visit_assignment, maybe_fold_stmt_addition):
Replace fold_build1 with fold_unary.
* tree-ssa-reassoc.c (optimize_ops_list): Replace fold_build2
with fold_binary.
2005-12-21 Steven Bosscher <stevenb@suse.de>
PR rtl-optimization/25196

View File

@ -786,7 +786,7 @@ estimate_niter_from_size_of_data (struct loop *loop,
&& TREE_CODE (step) == INTEGER_CST)
{
tree i_plus_s = fold_build2 (PLUS_EXPR, integer_type_node, init, step);
tree sign = fold_build2 (GT_EXPR, boolean_type_node, i_plus_s, init);
tree sign = fold_binary (GT_EXPR, boolean_type_node, i_plus_s, init);
if (sign == boolean_true_node)
estimation = fold_build2 (CEIL_DIV_EXPR, integer_type_node,

View File

@ -1191,9 +1191,9 @@ visit_assignment (tree stmt, tree *output_p)
if (TREE_CODE (orig_lhs) == VIEW_CONVERT_EXPR
&& val.lattice_val == CONSTANT)
{
tree w = fold_build1 (VIEW_CONVERT_EXPR,
TREE_TYPE (TREE_OPERAND (orig_lhs, 0)),
val.value);
tree w = fold_unary (VIEW_CONVERT_EXPR,
TREE_TYPE (TREE_OPERAND (orig_lhs, 0)),
val.value);
orig_lhs = TREE_OPERAND (orig_lhs, 0);
if (w && is_gimple_min_invariant (w))
@ -1901,9 +1901,9 @@ maybe_fold_stmt_addition (tree expr)
{
if (TYPE_UNSIGNED (TREE_TYPE (op1)))
return NULL;
op1 = fold_build1 (NEGATE_EXPR, TREE_TYPE (op1), op1);
op1 = fold_unary (NEGATE_EXPR, TREE_TYPE (op1), op1);
/* ??? In theory fold should always produce another integer. */
if (TREE_CODE (op1) != INTEGER_CST)
if (op1 == NULL || TREE_CODE (op1) != INTEGER_CST)
return NULL;
}

View File

@ -755,10 +755,10 @@ optimize_ops_list (enum tree_code opcode,
&& lang_hooks.types_compatible_p (TREE_TYPE (oelm1->op),
TREE_TYPE (oelast->op)))
{
tree folded = fold_build2 (opcode, TREE_TYPE (oelm1->op),
tree folded = fold_binary (opcode, TREE_TYPE (oelm1->op),
oelm1->op, oelast->op);
if (is_gimple_min_invariant (folded))
if (folded && is_gimple_min_invariant (folded))
{
if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, "Merging constants\n");