tree-flow.h (widen_bitfield): Remove declaration.

2008-03-26  Richard Guenther  <rguenther@suse.de>

	* tree-flow.h (widen_bitfield): Remove declaration.
	* tree-ssa-ccp.c (visit_assignment): Remove unneeded code.
	(widen_bitfield): Remove function.
	* tree-ssa-dom.c (record_equivalences_from_stmt): Remove unneeded
	code.

From-SVN: r133597
This commit is contained in:
Richard Guenther 2008-03-26 11:09:43 +00:00 committed by Richard Biener
parent 49e013b373
commit cf3135aaa1
4 changed files with 14 additions and 134 deletions

View File

@ -1,3 +1,11 @@
2008-03-26 Richard Guenther <rguenther@suse.de>
* tree-flow.h (widen_bitfield): Remove declaration.
* tree-ssa-ccp.c (visit_assignment): Remove unneeded code.
(widen_bitfield): Remove function.
* tree-ssa-dom.c (record_equivalences_from_stmt): Remove unneeded
code.
2008-03-25 Andrew Pinski <andrew_pinski@playstation.sony.com>
PR target/31558

View File

@ -942,7 +942,6 @@ bool fold_stmt (tree *);
bool fold_stmt_inplace (tree);
tree get_symbol_constant_value (tree);
tree fold_const_aggregate_ref (tree);
tree widen_bitfield (tree, tree, tree);
/* In tree-vrp.c */
tree vrp_evaluate_conditional (tree, tree);

View File

@ -1264,50 +1264,6 @@ visit_assignment (tree stmt, tree *output_p)
/* Evaluate the statement. */
val = evaluate_stmt (stmt);
/* If the original LHS was a VIEW_CONVERT_EXPR, modify the constant
value to be a VIEW_CONVERT_EXPR of the old constant value.
??? Also, if this was a definition of a bitfield, we need to widen
the constant value into the type of the destination variable. This
should not be necessary if GCC represented bitfields properly. */
{
tree orig_lhs = GIMPLE_STMT_OPERAND (stmt, 0);
if (TREE_CODE (orig_lhs) == VIEW_CONVERT_EXPR
&& val.lattice_val == CONSTANT)
{
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))
val.value = w;
else
{
val.lattice_val = VARYING;
val.value = NULL;
}
}
if (val.lattice_val == CONSTANT
&& TREE_CODE (orig_lhs) == COMPONENT_REF
&& DECL_BIT_FIELD (TREE_OPERAND (orig_lhs, 1)))
{
tree w = widen_bitfield (val.value, TREE_OPERAND (orig_lhs, 1),
orig_lhs);
if (w && is_gimple_min_invariant (w))
val.value = w;
else
{
val.lattice_val = VARYING;
val.value = NULL_TREE;
val.mem_ref = NULL_TREE;
}
}
}
retval = SSA_PROP_NOT_INTERESTING;
/* Set the lattice value of the statement's output. */
@ -1535,64 +1491,6 @@ struct gimple_opt_pass pass_store_ccp =
}
};
/* Given a constant value VAL for bitfield FIELD, and a destination
variable VAR, return VAL appropriately widened to fit into VAR. If
FIELD is wider than HOST_WIDE_INT, NULL is returned. */
tree
widen_bitfield (tree val, tree field, tree var)
{
unsigned HOST_WIDE_INT var_size, field_size;
tree wide_val;
unsigned HOST_WIDE_INT mask;
unsigned int i;
/* We can only do this if the size of the type and field and VAL are
all constants representable in HOST_WIDE_INT. */
if (!host_integerp (TYPE_SIZE (TREE_TYPE (var)), 1)
|| !host_integerp (DECL_SIZE (field), 1)
|| !host_integerp (val, 0))
return NULL_TREE;
var_size = tree_low_cst (TYPE_SIZE (TREE_TYPE (var)), 1);
field_size = tree_low_cst (DECL_SIZE (field), 1);
/* Give up if either the bitfield or the variable are too wide. */
if (field_size > HOST_BITS_PER_WIDE_INT || var_size > HOST_BITS_PER_WIDE_INT)
return NULL_TREE;
gcc_assert (var_size >= field_size);
/* If the sign bit of the value is not set or the field's type is unsigned,
just mask off the high order bits of the value. */
if (DECL_UNSIGNED (field)
|| !(tree_low_cst (val, 0) & (((HOST_WIDE_INT)1) << (field_size - 1))))
{
/* Zero extension. Build a mask with the lower 'field_size' bits
set and a BIT_AND_EXPR node to clear the high order bits of
the value. */
for (i = 0, mask = 0; i < field_size; i++)
mask |= ((HOST_WIDE_INT) 1) << i;
wide_val = fold_build2 (BIT_AND_EXPR, TREE_TYPE (var), val,
build_int_cst (TREE_TYPE (var), mask));
}
else
{
/* Sign extension. Create a mask with the upper 'field_size'
bits set and a BIT_IOR_EXPR to set the high order bits of the
value. */
for (i = 0, mask = 0; i < (var_size - field_size); i++)
mask |= ((HOST_WIDE_INT) 1) << (var_size - i - 1);
wide_val = fold_build2 (BIT_IOR_EXPR, TREE_TYPE (var), val,
build_int_cst (TREE_TYPE (var), mask));
}
return wide_val;
}
/* A subroutine of fold_stmt_r. Attempts to fold *(A+O) to A[X].
BASE is an array type. OFFSET is a byte displacement. ORIG_TYPE
is the desired result type. */

View File

@ -1595,38 +1595,13 @@ record_equivalences_from_stmt (tree stmt, int may_optimize_p, stmt_ann_t ann)
tree rhs = GIMPLE_STMT_OPERAND (stmt, 1);
tree new_stmt;
/* FIXME: If the LHS of the assignment is a bitfield and the RHS
is a constant, we need to adjust the constant to fit into the
type of the LHS. If the LHS is a bitfield and the RHS is not
a constant, then we can not record any equivalences for this
statement since we would need to represent the widening or
narrowing of RHS. This fixes gcc.c-torture/execute/921016-1.c
and should not be necessary if GCC represented bitfields
properly. */
if (lhs_code == COMPONENT_REF
&& DECL_BIT_FIELD (TREE_OPERAND (lhs, 1)))
{
if (TREE_CONSTANT (rhs))
rhs = widen_bitfield (rhs, TREE_OPERAND (lhs, 1), lhs);
else
rhs = NULL;
/* Build a new statement with the RHS and LHS exchanged. */
new_stmt = build_gimple_modify_stmt (rhs, lhs);
create_ssa_artificial_load_stmt (new_stmt, stmt, true);
/* If the value overflowed, then we can not use this equivalence. */
if (rhs && ! is_gimple_min_invariant (rhs))
rhs = NULL;
}
if (rhs)
{
/* Build a new statement with the RHS and LHS exchanged. */
new_stmt = build_gimple_modify_stmt (rhs, lhs);
create_ssa_artificial_load_stmt (new_stmt, stmt, true);
/* Finally enter the statement into the available expression
table. */
lookup_avail_expr (new_stmt, true);
}
/* Finally enter the statement into the available expression
table. */
lookup_avail_expr (new_stmt, true);
}
}