diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-16 21:59:37 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-16 21:59:37 +0000 |
| commit | f02619cd8b13846942322fadd2c0325c6aa2cbb8 (patch) | |
| tree | 48699d95fe9545c34c0a8e358520cb9ee0375776 /gcc/tree-ssa-ccp.c | |
| parent | 7dc9211e0e8977d8c5a5b8f4dc226ac0a5187bda (diff) | |
| download | gcc-f02619cd8b13846942322fadd2c0325c6aa2cbb8.tar.gz | |
2010-10-16 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 165564
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@165565 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-ssa-ccp.c')
| -rw-r--r-- | gcc/tree-ssa-ccp.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 2fa4726e1ea..650494144cd 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -2267,6 +2267,7 @@ ccp_fold_stmt (gimple_stmt_iterator *gsi) tree lhs = gimple_call_lhs (stmt); tree val; tree argt; + tree callee; bool changed = false; unsigned i; @@ -2306,16 +2307,24 @@ ccp_fold_stmt (gimple_stmt_iterator *gsi) changed = true; } } - if (TREE_CODE (gimple_call_fn (stmt)) == OBJ_TYPE_REF) + + callee = gimple_call_fn (stmt); + if (TREE_CODE (callee) == OBJ_TYPE_REF + && TREE_CODE (OBJ_TYPE_REF_EXPR (callee)) == SSA_NAME) { - tree expr = OBJ_TYPE_REF_EXPR (gimple_call_fn (stmt)); - expr = valueize_op (expr); - if (TREE_CODE (expr) == ADDR_EXPR - && TREE_CODE (TREE_OPERAND (expr, 0)) == FUNCTION_DECL) - { - gimple_call_set_fn (stmt, expr); - changed = true; - } + tree expr = OBJ_TYPE_REF_EXPR (callee); + OBJ_TYPE_REF_EXPR (callee) = valueize_op (expr); + if (TREE_CODE (OBJ_TYPE_REF_EXPR (callee)) == ADDR_EXPR) + { + tree t; + t = gimple_fold_obj_type_ref (callee, NULL_TREE); + if (t) + { + gimple_call_set_fn (stmt, t); + changed = true; + } + } + OBJ_TYPE_REF_EXPR (callee) = expr; } return changed; |