diff options
| author | Andrew Pinski <pinskia@physics.uc.edu> | 2006-03-01 15:15:38 +0000 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2006-03-01 07:15:38 -0800 |
| commit | 1809ff6b9a9fd3ff2097bc802f328d8530ab2420 (patch) | |
| tree | dbc68e04e55cfcfd5acfe0bb930d61ef8c0bef2c /gcc/tree-ssa-ccp.c | |
| parent | c10bc6e9a0f720a8e8db03c90960017218fe9879 (diff) | |
| download | gcc-1809ff6b9a9fd3ff2097bc802f328d8530ab2420.zip gcc-1809ff6b9a9fd3ff2097bc802f328d8530ab2420.tar.gz gcc-1809ff6b9a9fd3ff2097bc802f328d8530ab2420.tar.bz2 | |
re PR middle-end/26022 (ICE with references and virtual functions)
2006-01-23 Andrew Pinski <pinskia@physics.uc.edu>
PR middle-end/26022
Revert:
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-02-28 Andrew Pinski <pinskia@physics.uc.edu>
PR middle-end/26022
* g++.dg/opt/return-slot1.C: New test.
From-SVN: r111602
Diffstat (limited to 'gcc/tree-ssa-ccp.c')
| -rw-r--r-- | gcc/tree-ssa-ccp.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index ec70c36..309a282 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -2350,6 +2350,40 @@ 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. Also + CALL_EXPR_RETURN_SLOT_OPT needs to be handled correctly and + copied, fold_ternary does not have not information. */ + 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. */ |