From patchwork Wed Feb 27 20:00:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 31644 Received: (qmail 85657 invoked by alias); 27 Feb 2019 20:06:06 -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 85607 invoked by uid 89); 27 Feb 2019 20:06:05 -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= 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:06:04 +0000 Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 026EE80873 for ; Wed, 27 Feb 2019 15:00:39 -0500 (EST) Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id R_0nE61ZwlBA; Wed, 27 Feb 2019 15:00:38 -0500 (EST) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id B94058083A; Wed, 27 Feb 2019 15:00:38 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com B94058083A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1551297638; bh=NsC5+NjT0Gs8UJ68fMX07BWaraoKrudqDC2Oi3/KjN0=; h=From:To:Date:Message-Id:MIME-Version; b=myunGfuuKooQNZtIhTSJUaZlACsbWKiR/2ppSGEcqFXj+KgAhBZvaFyvw3fv+5aG+ bFqmnjX7PW2W6AYkwNlbhwlJ8heV2W5orC+KhDM9vaCx4DOjevFGvsOytwuS6yubF4 e4BRqns1KZTTwL4f+hTBtkccqc0HbsfpskcHgmZfkDSiR06Go6CNXujB76E2o4h09/ Gxts/SOPiQBpjcSKJPM8TJcv3k57/H2EEf55zmC4x+JWpIivawlwTZPti8pDAqStSp tXkvg6kXIWM6Rm6gbjZ6ORWWiOStzHlNcTNgqRB2nraquVWhBiCeVLoNlY4YpUuAXT Ea8eekVTXPDJA== Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id yxaKqoBe9wOH; Wed, 27 Feb 2019 15:00:38 -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 9BFDF80828; Wed, 27 Feb 2019 15:00:38 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 11/13] Split rank_one_type_parm_struct from rank_one_type Date: Wed, 27 Feb 2019 15:00:26 -0500 Message-Id: <20190227200028.27360-12-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_struct): New function extracted from... (rank_one_type): ... this. --- gdb/gdbtypes.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 3cf6ba87f7..ef6b17651a 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4162,6 +4162,26 @@ rank_one_type_parm_complex (struct type *parm, struct type *arg, struct value *v } } +/* rank_one_type helper for when PARM's type code is TYPE_CODE_STRUCT. */ + +static struct rank +rank_one_type_parm_struct (struct type *parm, struct type *arg, struct value *value) +{ + struct rank rank = {0, 0}; + + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_STRUCT: + /* Check for derivation */ + rank.subrank = distance_to_ancestor (parm, arg, 0); + if (rank.subrank >= 0) + return sum_ranks (BASE_CONVERSION_BADNESS, rank); + /* fall through */ + 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 @@ -4272,18 +4292,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) case TYPE_CODE_COMPLEX: return rank_one_type_parm_complex (parm, arg, value); case TYPE_CODE_STRUCT: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_STRUCT: - /* Check for derivation */ - rank.subrank = distance_to_ancestor (parm, arg, 0); - if (rank.subrank >= 0) - return sum_ranks (BASE_CONVERSION_BADNESS, rank); - /* fall through */ - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; + return rank_one_type_parm_struct (parm, arg, value); case TYPE_CODE_UNION: switch (TYPE_CODE (arg)) {