From 16ac8575504420eb56680d82edbd6c8879a67faf Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Thu, 20 Mar 2008 22:06:40 +0000 Subject: tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Remove special casing of constant qualifiers. 2008-03-20 Richard Guenther * tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Remove special casing of constant qualifiers. * tree-ssa.c (useless_type_conversion_p_1): Instead do not care about them in general. * tree-ssa-ccp.c (ccp_fold): Addresses are constant or not regardless of their type. (fold_stmt_r): Forcefully fold *& if we end up with that. * gcc.dg/tree-ssa/ssa-ccp-17.c: New testcase. From-SVN: r133400 --- gcc/tree-ssa-forwprop.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'gcc/tree-ssa-forwprop.c') diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index 84553fb..e6402ad 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -601,14 +601,8 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs, tree use_stmt, propagate the ADDR_EXPR into the use of NAME and fold the result. */ if (TREE_CODE (lhs) == INDIRECT_REF && TREE_OPERAND (lhs, 0) == name - /* This will not allow stripping const qualification from - pointers which we want to allow specifically here to clean up - the IL for initialization of constant objects. */ - && (useless_type_conversion_p (TREE_TYPE (TREE_OPERAND (lhs, 0)), - TREE_TYPE (def_rhs)) - /* So explicitly check for this here. */ - || (TYPE_QUALS (TREE_TYPE (TREE_TYPE (TREE_OPERAND (lhs, 0)))) - ^ TYPE_QUALS (TREE_TYPE (TREE_TYPE (def_rhs)))) == TYPE_QUAL_CONST) + && useless_type_conversion_p (TREE_TYPE (TREE_OPERAND (lhs, 0)), + TREE_TYPE (def_rhs)) /* ??? This looks redundant, but is required for bogus types that can sometimes occur. */ && useless_type_conversion_p (TREE_TYPE (lhs), @@ -635,13 +629,10 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs, tree use_stmt, propagate the ADDR_EXPR into the use of NAME and fold the result. */ if (TREE_CODE (rhs) == INDIRECT_REF && TREE_OPERAND (rhs, 0) == name - /* ??? This doesn't allow stripping const qualification to - streamline the IL for reads from non-constant objects. */ - && (useless_type_conversion_p (TREE_TYPE (TREE_OPERAND (rhs, 0)), - TREE_TYPE (def_rhs)) - /* So explicitly check for this here. */ - || (TYPE_QUALS (TREE_TYPE (TREE_TYPE (TREE_OPERAND (rhs, 0)))) - ^ TYPE_QUALS (TREE_TYPE (TREE_TYPE (def_rhs)))) == TYPE_QUAL_CONST) + && useless_type_conversion_p (TREE_TYPE (TREE_OPERAND (rhs, 0)), + TREE_TYPE (def_rhs)) + /* ??? This looks redundant, but is required for bogus types + that can sometimes occur. */ && useless_type_conversion_p (TREE_TYPE (rhs), TREE_TYPE (TREE_OPERAND (def_rhs, 0)))) { -- cgit v1.1