From patchwork Wed Oct 23 18:50:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 35257 Received: (qmail 98114 invoked by alias); 23 Oct 2019 18:50:18 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 98106 invoked by uid 89); 23 Oct 2019 18:50:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=ftype X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 Oct 2019 18:50:16 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id E844920B45; Wed, 23 Oct 2019 14:50:14 -0400 (EDT) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 379F82018B; Wed, 23 Oct 2019 14:50:07 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 0A106238BA; Wed, 23 Oct 2019 14:50:07 -0400 (EDT) X-Gerrit-PatchSet: 3 Date: Wed, 23 Oct 2019 14:50:05 -0400 From: "Sourceware to Gerrit sync (Code Review)" To: Tankut Baris Aktemur , Luis Machado , Tom de Vries , Simon Marchi , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [pushed] infcall: move assertions in 'call_function_by_hand_dummy' to an earli... X-Gerrit-Change-Id: I411ac083ac6a9ee6eb93c4b82393a81a4fc927be X-Gerrit-Change-Number: 139 X-Gerrit-ChangeURL: X-Gerrit-Commit: 39bcc47c7e94c746d5acdb52f20f9617a6473292 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tankut.baris.aktemur@intel.com, simon.marchi@polymtl.ca, tdevries@suse.de, luis.machado@linaro.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3 Message-Id: <20191023185007.0A106238BA@gnutoolchain-gerrit.osci.io> The original change was created by Tankut Baris Aktemur. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/139 ...................................................................... infcall: move assertions in 'call_function_by_hand_dummy' to an earlier spot This is a refactoring that performs type assertions on the callee function at the beginning of 'call_function_by_hand_dummy' rather than at a later point so that - the checks are grouped together at the beginning of the function for improved readability, and - we don't have to align and push things on the stack only to find out later that the function call is illegal. gdb/ChangeLog: 2019-10-23 Tankut Baris Aktemur * infcall.c (call_function_by_hand_dummy): Refactor. Change-Id: I411ac083ac6a9ee6eb93c4b82393a81a4fc927be --- M gdb/ChangeLog M gdb/infcall.c 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 53f50e2..6fafc44 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2019-10-23 Tankut Baris Aktemur + * infcall.c (call_function_by_hand_dummy): Refactor. + +2019-10-23 Tankut Baris Aktemur + * MAINTAINERS (Write After Approval): Add Tankut Baris Aktemur. 2019-10-23 Tom Tromey diff --git a/gdb/infcall.c b/gdb/infcall.c index 726f14d..0d8d5b2 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -746,6 +746,27 @@ if (!gdbarch_push_dummy_call_p (gdbarch)) error (_("This target does not support function calls.")); + /* Find the function type and do a sanity check. */ + type *ftype; + type *values_type; + CORE_ADDR funaddr = find_function_addr (function, &values_type, &ftype); + + if (values_type == NULL) + values_type = default_return_type; + if (values_type == NULL) + { + const char *name = get_function_name (funaddr, + name_buf, sizeof (name_buf)); + error (_("'%s' has unknown return type; " + "cast the call to its declared return type"), + name); + } + + values_type = check_typedef (values_type); + + if (args.size () < TYPE_NFIELDS (ftype)) + error (_("Too few arguments in function call.")); + /* A holder for the inferior status. This is only needed while we're preparing the inferior function call. */ infcall_control_state_up inf_status (save_infcall_control_state ()); @@ -851,23 +872,6 @@ } } - type *ftype; - type *values_type; - CORE_ADDR funaddr = find_function_addr (function, &values_type, &ftype); - - if (values_type == NULL) - values_type = default_return_type; - if (values_type == NULL) - { - const char *name = get_function_name (funaddr, - name_buf, sizeof (name_buf)); - error (_("'%s' has unknown return type; " - "cast the call to its declared return type"), - name); - } - - values_type = check_typedef (values_type); - /* Are we returning a value using a structure return? */ if (gdbarch_return_in_first_hidden_param_p (gdbarch, values_type)) @@ -945,9 +949,6 @@ internal_error (__FILE__, __LINE__, _("bad switch")); } - if (args.size () < TYPE_NFIELDS (ftype)) - error (_("Too few arguments in function call.")); - for (int i = args.size () - 1; i >= 0; i--) { int prototyped;