mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-19 00:01:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR middle-end/24437 (OBJ_TYPE_REF handling in fold_stmt should be moved to fold)

Browse Source 
2006-01-23  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/24437
        * tree-ssa-ccp.c (fold_stmt): Move folding of OBJ_TYPE_REF
        with a call expr to ...
        * fold-const.c (fold_ternary) <case CALL_EXPR>: Here.

From-SVN: r110116
This commit is contained in:
Andrew Pinski 2006-01-23 14:56:45 +00:00 committed by Andrew Pinski
parent c685878451
commit bac9efeaeb
3 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2006-01-23 Andrew Pinski <pinskia@physics.uc.edu>
PR middle-end/24437
* tree-ssa-ccp.c (fold_stmt): Move folding of OBJ_TYPE_REF
with a call expr to ...
* fold-const.c (fold_ternary) <case CALL_EXPR>: Here.
2006-01-23 Richard Guenther <rguenther@suse.de>
* cfgloopmanip.c (lv_adjust_loop_entry_edge): Add comment

20
gcc/fold-const.c
View File

@ -10295,6 +10295,26 @@ fold_ternary (enum tree_code code, tree type, tree op0, tree op1, tree op2)
&& TREE_CODE (TREE_OPERAND (op0, 0)) == FUNCTION_DECL
&& DECL_BUILT_IN (TREE_OPERAND (op0, 0)))
return fold_builtin (TREE_OPERAND (op0, 0), op1, false);
/* Check for resolvable OBJ_TYPE_REF. The only sorts we can resolve
here are when we've propagated the address of a decl into the
object slot. */
if (TREE_CODE (op0) == OBJ_TYPE_REF
&& lang_hooks.fold_obj_type_ref
&& TREE_CODE (OBJ_TYPE_REF_OBJECT (op0)) == ADDR_EXPR
&& DECL_P (TREE_OPERAND (OBJ_TYPE_REF_OBJECT (op0), 0)))
{
tree t;
/* ??? Caution: Broken ADDR_EXPR semantics means that
looking at the type of the operand of the addr_expr
can yield an array type. See silly exception in
check_pointer_types_r. */
t = TREE_TYPE (TREE_TYPE (OBJ_TYPE_REF_OBJECT (op0)));
t = lang_hooks.fold_obj_type_ref (op0, t);
if (t)
return fold_build3 (code, type, t, op1, op2);
}
return NULL_TREE;
case BIT_FIELD_REF:

32
gcc/tree-ssa-ccp.c
View File

@ -2342,38 +2342,6 @@ fold_stmt (tree *stmt_p)
callee = get_callee_fndecl (rhs);
if (callee && DECL_BUILT_IN (callee))
result = ccp_fold_builtin (stmt, rhs);
else
{
/* Check for resolvable OBJ_TYPE_REF. The only sorts we can resolve
here are when we've propagated the address of a decl into the
object slot. */
/* ??? Should perhaps do this in fold proper. However, doing it
there requires that we create a new CALL_EXPR, and that requires
copying EH region info to the new node. Easier to just do it
here where we can just smash the call operand. */
callee = TREE_OPERAND (rhs, 0);
if (TREE_CODE (callee) == OBJ_TYPE_REF
&& lang_hooks.fold_obj_type_ref
&& TREE_CODE (OBJ_TYPE_REF_OBJECT (callee)) == ADDR_EXPR
&& DECL_P (TREE_OPERAND
(OBJ_TYPE_REF_OBJECT (callee), 0)))
{
tree t;
/* ??? Caution: Broken ADDR_EXPR semantics means that
looking at the type of the operand of the addr_expr
can yield an array type. See silly exception in
check_pointer_types_r. */
t = TREE_TYPE (TREE_TYPE (OBJ_TYPE_REF_OBJECT (callee)));
t = lang_hooks.fold_obj_type_ref (callee, t);
if (t)
{
TREE_OPERAND (rhs, 0) = t;
changed = true;
}
}
}
}
/* If we couldn't fold the RHS, hand over to the generic fold routines. */