From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12575 invoked by alias); 10 Oct 2014 20:43:36 -0000 Mailing-List: contact libffi-discuss-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libffi-discuss-owner@sourceware.org Received: (qmail 12238 invoked by uid 89); 10 Oct 2014 20:43:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qg0-f47.google.com Received: from mail-qg0-f47.google.com (HELO mail-qg0-f47.google.com) (209.85.192.47) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 10 Oct 2014 20:43:31 +0000 Received: by mail-qg0-f47.google.com with SMTP id i50so4420486qgf.20 for ; Fri, 10 Oct 2014 13:43:29 -0700 (PDT) X-Received: by 10.224.76.5 with SMTP id a5mr12802094qak.72.1412973809222; Fri, 10 Oct 2014 13:43:29 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id s49sm5909008qge.15.2014.10.10.13.43.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Oct 2014 13:43:28 -0700 (PDT) From: Richard Henderson To: gcc-patches@gcc.gnu.org Cc: libffi-discuss@sourceware.org, gofrontend-dev@googlegroups.com Subject: [PATCH 02/13] Allow the front-end to create calls with a static chain Date: Fri, 10 Oct 2014 20:43:00 -0000 Message-Id: <1412973773-3942-3-git-send-email-rth@redhat.com> In-Reply-To: <1412973773-3942-1-git-send-email-rth@redhat.com> References: <1412973773-3942-1-git-send-email-rth@redhat.com> X-IsSubscribed: yes X-SW-Source: 2014/txt/msg00097.txt.bz2 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. --- gcc/calls.c | 14 ++++++++------ gcc/gimple-fold.c | 21 +++++++++++++++++++++ gcc/gimplify.c | 17 ++++++++++++++++- gcc/tree-cfg.c | 22 +++++++--------------- 4 files changed, 52 insertions(+), 22 deletions(-) diff --git a/gcc/calls.c b/gcc/calls.c index 9c19f38..68abe46 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -173,7 +173,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, @@ -193,12 +193,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); @@ -3106,8 +3107,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 8ac2211..d5baa72 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -2636,6 +2636,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 6ee85f2..a08e217 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -2414,7 +2414,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); @@ -2436,6 +2436,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 e88842a..5fd56c1 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -3297,22 +3297,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 -- 1.9.3