diff options
| author | Andrew Pinski <pinskia@physics.uc.edu> | 2006-01-23 14:56:45 +0000 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2006-01-23 06:56:45 -0800 |
| commit | bac9efeaebb5cb047d731cf8a0590c69f83b4842 (patch) | |
| tree | 711dff16c947cdd28322b754bcd859f81158a7fd | |
| parent | c685878451ba47834d3e1730bfaa95a8baccba95 (diff) | |
| download | gcc-bac9efeaebb5cb047d731cf8a0590c69f83b4842.zip gcc-bac9efeaebb5cb047d731cf8a0590c69f83b4842.tar.gz gcc-bac9efeaebb5cb047d731cf8a0590c69f83b4842.tar.bz2 | |
re PR middle-end/24437 (OBJ_TYPE_REF handling in fold_stmt should be moved to fold)
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
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fold-const.c | 20 | ||||
| -rw-r--r-- | gcc/tree-ssa-ccp.c | 32 |
3 files changed, 27 insertions, 32 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b040223..6ff4fc8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 2b71ef3..ed100ce 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -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: diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 6731045..4513f97 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -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. */ |