From 156cc902a8276c9aa89fb472320a55260c0225da Mon Sep 17 00:00:00 2001 From: rth Date: Wed, 19 Nov 2014 13:30:59 +0000 Subject: Allow the front-end to create calls with a static chain And, at the same time, allow indirect calls to have a static chain. We'll always eliminate the static chain if we can prove it's unused. * calls.c (prepare_call_address): Allow decl or type for first arg. (expand_call): Pass type to prepare_call_address if no decl. * gimple-fold.c (gimple_fold_call): Eliminate the static chain if the function doesn't use it; fold it otherwise. * gimplify.c (gimplify_call_expr): Gimplify the static chain. * tree-cfg.c (verify_gimple_call): Allow a static chain on indirect function calls. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217770 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/calls.c | 14 ++++++++------ gcc/gimple-fold.c | 21 +++++++++++++++++++++ gcc/gimplify.c | 17 ++++++++++++++++- gcc/tree-cfg.c | 22 +++++++--------------- 5 files changed, 60 insertions(+), 22 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9a9cf7bc6ed..8d47292c654 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2014-11-19 Richard Henderson + * calls.c (prepare_call_address): Allow decl or type for first arg. + (expand_call): Pass type to prepare_call_address if no decl. + * gimple-fold.c (gimple_fold_call): Eliminate the static chain if + the function doesn't use it; fold it otherwise. + * gimplify.c (gimplify_call_expr): Gimplify the static chain. + * tree-cfg.c (verify_gimple_call): Allow a static chain on indirect + function calls. + * targhooks.c (default_static_chain): Remove check for DECL_STATIC_CHAIN. * config/moxie/moxie.c (moxie_static_chain): Likewise. diff --git a/gcc/calls.c b/gcc/calls.c index 7f55aafa734..c64c0eb6bf7 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -197,7 +197,7 @@ static void restore_fixed_argument_area (rtx, rtx, int, int); CALL_INSN_FUNCTION_USAGE information. */ rtx -prepare_call_address (tree fndecl, rtx funexp, rtx static_chain_value, +prepare_call_address (tree fndecl_or_type, rtx funexp, rtx static_chain_value, rtx *call_fusage, int reg_parm_seen, int sibcallp) { /* Make a valid memory address and copy constants through pseudo-regs, @@ -217,12 +217,13 @@ prepare_call_address (tree fndecl, rtx funexp, rtx static_chain_value, #endif } - if (static_chain_value != 0) + if (static_chain_value != 0 + && (TREE_CODE (fndecl_or_type) != FUNCTION_DECL + || DECL_STATIC_CHAIN (fndecl_or_type))) { rtx chain; - gcc_assert (fndecl); - chain = targetm.calls.static_chain (fndecl, false); + chain = targetm.calls.static_chain (fndecl_or_type, false); static_chain_value = convert_memory_address (Pmode, static_chain_value); emit_move_insn (chain, static_chain_value); @@ -3278,8 +3279,9 @@ expand_call (tree exp, rtx target, int ignore) } after_args = get_last_insn (); - funexp = prepare_call_address (fndecl, funexp, static_chain_value, - &call_fusage, reg_parm_seen, pass == 0); + funexp = prepare_call_address (fndecl ? fndecl : fntype, funexp, + static_chain_value, &call_fusage, + reg_parm_seen, pass == 0); load_register_parameters (args, num_actuals, &call_fusage, flags, pass == 0, &sibcall_failure); diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index acdadcd8827..4f716b2e0e0 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -2723,6 +2723,27 @@ gimple_fold_call (gimple_stmt_iterator *gsi, bool inplace) } } + /* Check for indirect calls that became direct calls, and then + no longer require a static chain. */ + if (gimple_call_chain (stmt)) + { + tree fn = gimple_call_fndecl (stmt); + if (fn && !DECL_STATIC_CHAIN (fn)) + { + gimple_call_set_chain (stmt, NULL); + changed = true; + } + else + { + tree tmp = maybe_fold_reference (gimple_call_chain (stmt), false); + if (tmp) + { + gimple_call_set_chain (stmt, tmp); + changed = true; + } + } + } + if (inplace) return changed; diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 93c06debda5..c46fb663ef1 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -2432,7 +2432,7 @@ gimplify_call_expr (tree *expr_p, gimple_seq *pre_p, bool want_value) } } - /* Finally, gimplify the function arguments. */ + /* Gimplify the function arguments. */ if (nargs > 0) { for (i = (PUSH_ARGS_REVERSED ? nargs - 1 : 0); @@ -2454,6 +2454,21 @@ gimplify_call_expr (tree *expr_p, gimple_seq *pre_p, bool want_value) } } + /* Gimplify the static chain. */ + if (CALL_EXPR_STATIC_CHAIN (*expr_p)) + { + if (fndecl && !DECL_STATIC_CHAIN (fndecl)) + CALL_EXPR_STATIC_CHAIN (*expr_p) = NULL; + else + { + enum gimplify_status t; + t = gimplify_arg (&CALL_EXPR_STATIC_CHAIN (*expr_p), pre_p, + EXPR_LOCATION (*expr_p)); + if (t == GS_ERROR) + ret = GS_ERROR; + } + } + /* Verify the function result. */ if (want_value && fndecl && VOID_TYPE_P (TREE_TYPE (TREE_TYPE (fnptrtype)))) diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 9dd8961cb8f..71a828c37aa 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -3333,22 +3333,14 @@ verify_gimple_call (gimple stmt) return true; } - /* If there is a static chain argument, this should not be an indirect - call, and the decl should have DECL_STATIC_CHAIN set. */ - if (gimple_call_chain (stmt)) + /* If there is a static chain argument, the call should either be + indirect, or the decl should have DECL_STATIC_CHAIN set. */ + if (gimple_call_chain (stmt) + && fndecl + && !DECL_STATIC_CHAIN (fndecl)) { - if (!gimple_call_fndecl (stmt)) - { - error ("static chain in indirect gimple call"); - return true; - } - fn = TREE_OPERAND (fn, 0); - - if (!DECL_STATIC_CHAIN (fn)) - { - error ("static chain with function that doesn%'t use one"); - return true; - } + error ("static chain with function that doesn%'t use one"); + return true; } /* ??? The C frontend passes unpromoted arguments in case it -- cgit v1.2.1