From patchwork Wed Feb 27 20:00:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 31639 Received: (qmail 69617 invoked by alias); 27 Feb 2019 20:01: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 69321 invoked by uid 89); 27 Feb 2019 20:01:03 -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:01:01 +0000 Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 17AA080878 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 SBQ_wsEZ8Sap; Wed, 27 Feb 2019 15:00:38 -0500 (EST) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id D2E5680860; Wed, 27 Feb 2019 15:00:38 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com D2E5680860 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1551297638; bh=xG7yiPFbs91SZ8YvOUCFMuKQsmV1bTe7ct0QFXMsgpY=; h=From:To:Date:Message-Id:MIME-Version; b=j+qc/BNFx7lJHEipLqh3oFqFd2ih7IAy5ensfyekuKXcZg2GU+gFgZ+gZN6uNn0kl em7LBzLzU5fjc80x05c7gqnUEmnlQdltnmMrtgPg8OOj3UEhmj+BhxNqjviHQxbGTD bQzE9kyPqheuxbQFmW9GPfyCkxpu+hFXUJyxL7OutaWlaXNp4+XmLYSFvGuNwIYgvE W9PTSeN1FBcptv0vdVXaJfrR4lJBRT4+f0oSKd/WENLb5t48IudLLdVXsvgLi9gzoD Dt34nMfLroJFWWkuo8ZzQqKoQ08vJviwGkRp9V5lVzlOyuXi4pPdMEhuKtyzYSMN7+ T83e6mkui/fGA== Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id wZtrRrIKoBNc; 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 B269F80834; Wed, 27 Feb 2019 15:00:38 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 12/13] Split rank_one_type_parm_set from rank_one_type Date: Wed, 27 Feb 2019 15:00:27 -0500 Message-Id: <20190227200028.27360-13-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_set): New function extracted from... (rank_one_type): ... this. --- gdb/gdbtypes.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index ef6b17651a..dc054b9272 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4182,6 +4182,22 @@ rank_one_type_parm_struct (struct type *parm, struct type *arg, struct value *va } } +/* rank_one_type helper for when PARM's type code is TYPE_CODE_SET. */ + +static struct rank +rank_one_type_parm_set (struct type *parm, struct type *arg, struct value *value) +{ + switch (TYPE_CODE (arg)) + { + /* Not in C++ */ + case TYPE_CODE_SET: + return rank_one_type (TYPE_FIELD_TYPE (parm, 0), + TYPE_FIELD_TYPE (arg, 0), 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 @@ -4326,16 +4342,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) break; case TYPE_CODE_SET: - switch (TYPE_CODE (arg)) - { - /* Not in C++ */ - case TYPE_CODE_SET: - return rank_one_type (TYPE_FIELD_TYPE (parm, 0), - TYPE_FIELD_TYPE (arg, 0), NULL); - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; + return rank_one_type_parm_set (parm, arg, value); case TYPE_CODE_VOID: default: return INCOMPATIBLE_TYPE_BADNESS;