From patchwork Wed Feb 27 20:00:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 31636 Received: (qmail 69357 invoked by alias); 27 Feb 2019 20:01:04 -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 69088 invoked by uid 89); 27 Feb 2019 20:00:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=parms X-HELO: mail.efficios.com Received: from mail.efficios.com (HELO mail.efficios.com) (167.114.142.138) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 27 Feb 2019 20:00:40 +0000 Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 4F3EF807E7 for ; Wed, 27 Feb 2019 15:00:38 -0500 (EST) Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id wPc5r4waYB6x; Wed, 27 Feb 2019 15:00:38 -0500 (EST) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 076C2807C5; Wed, 27 Feb 2019 15:00:38 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 076C2807C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1551297638; bh=gpcyGeTcaqPVKTEg+iB6TghzqWFSVRarmjEhzxJHV1M=; h=From:To:Date:Message-Id:MIME-Version; b=USL8QI+wNrzzOD+LCL+2IV5yGiYCYwCmTNTnZ7vCcjp3s3iGIQ0eArdiCpEKpG+JD GWFzpZ7xgAaL7hG12MwIRkPQHFlfpDyt58UGtbcLpCXdb1lB7SZWjuFcZAaKvZV8lY u3xsTAoOG4SQWyxvMDVoTc8e0tdepUUh3CMzn32pUTli/PMhJjDc3ZNXowdhP1+Z9I jQLQyMaX/Y97b457f7fd6VXKemEl9b4t9laYofGunr7Xq9I0nHJ9u1EFcdACHCJio4 PqBxwYNIVHiHg1e/hOSm/Vqt6VLoo6uHa6NojOb1+6b9GW2nexaYu/eJCVf3sCBYWO oDWqOKgS1XapQ== Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id gt1Z8AROPvgW; Wed, 27 Feb 2019 15:00:37 -0500 (EST) Received: from smarchi-efficios.internal.efficios.com (192-222-157-41.qc.cable.ebox.net [192.222.157.41]) by mail.efficios.com (Postfix) with ESMTPSA id DC1C6807B4; Wed, 27 Feb 2019 15:00:37 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 03/13] Split rank_one_type_parm_func from rank_one_type Date: Wed, 27 Feb 2019 15:00:18 -0500 Message-Id: <20190227200028.27360-4-simon.marchi@efficios.com> In-Reply-To: <20190227200028.27360-1-simon.marchi@efficios.com> References: <20190227200028.27360-1-simon.marchi@efficios.com> MIME-Version: 1.0 gdb/ChangeLog: * gdbtypes.c (rank_one_type_parm_func): New function extracted from... (rank_one_type): ... this. --- gdb/gdbtypes.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index cd0f753263..45cd04815c 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -3898,6 +3898,20 @@ rank_one_type_parm_array (struct type *parm, struct type *arg, struct value *val } } +/* rank_one_type helper for when PARM's type code is TYPE_CODE_FUNC. */ + +static struct rank +rank_one_type_parm_func (struct type *parm, struct type *arg, struct value *value) +{ + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_PTR: /* funcptr -> func */ + return rank_one_type (parm, TYPE_TARGET_TYPE (arg), NULL); + default: + return INCOMPATIBLE_TYPE_BADNESS; + } +} + /* Compare one type (PARM) for compatibility with another (ARG). * PARM is intended to be the parameter type of a function; and * ARG is the supplied argument's type. This function tests if @@ -3992,13 +4006,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) case TYPE_CODE_ARRAY: return rank_one_type_parm_array (parm, arg, value); case TYPE_CODE_FUNC: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_PTR: /* funcptr -> func */ - return rank_one_type (parm, TYPE_TARGET_TYPE (arg), NULL); - default: - return INCOMPATIBLE_TYPE_BADNESS; - } + return rank_one_type_parm_func (parm, arg, value); case TYPE_CODE_INT: switch (TYPE_CODE (arg)) {